regenerate hive tests

85 files changed, 27864 insertions, 14442 deletions

diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1.json b/BlockchainTests/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1_d0g0v0.json
index 2989de71e..5780e13d2 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "call_OOG_additionalGasCosts1_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/call_OOG_additionalGasCosts1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x7530",
-                    "hash" : "49240308f414121df2ea1f4b002454c4797d26e0ea08e796109fa3829f1b8c44",
-                    "mixHash" : "90622df60e30c3793e9aac7d02f6e564da4b51a8dc4ce30a16458e4fc08ba1ff",
-                    "nonce" : "983e138f9a136b49",
+                    "hash" : "0xacfdc530d7222cfb4ff15051c15ccee4cb3cea417571b084ce409dd3c57f3a1f",
+                    "mixHash" : "0xa5b946252ff00a39f9eb16fa55533fa251d7a4421f40552423bf3141be071155",
+                    "nonce" : "0xf507088c02b2db4e",
                     "number" : "0x01",
-                    "parentHash" : "8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
-                    "receiptTrie" : "5cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9",
-                    "stateRoot" : "74794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9",
+                    "parentHash" : "0x8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
+                    "receiptTrie" : "0x5cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9",
+                    "stateRoot" : "0x74794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a08e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9a02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a05cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a090622df60e30c3793e9aac7d02f6e564da4b51a8dc4ce30a16458e4fc08ba1ff88983e138f9a136b49f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a08e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9a02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a05cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a0a5b946252ff00a39f9eb16fa55533fa251d7a4421f40552423bf3141be07115588f507088c02b2db4ef861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7530",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bf",
                         "s" : "0x53a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1db",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,60 +44,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "eecf2d4085548a36784013b5c7212977f3462813adecfe55353ca2a5f9f87597",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xeecf2d4085548a36784013b5c7212977f3462813adecfe55353ca2a5f9f87597",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eecf2d4085548a36784013b5c7212977f3462813adecfe55353ca2a5f9f87597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "49240308f414121df2ea1f4b002454c4797d26e0ea08e796109fa3829f1b8c44",
+        "lastblockhash" : "0xacfdc530d7222cfb4ff15051c15ccee4cb3cea417571b084ce409dd3c57f3a1f",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001611770f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f47530",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7638ad0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001611770f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -100,36 +105,41 @@
         }
     },
     "call_OOG_additionalGasCosts1_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/call_OOG_additionalGasCosts1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x54df",
-                    "hash" : "48d0e82e223ef7be3e35dd5c2c0973786c60702fc86c90f0a42135e70c1620ad",
-                    "mixHash" : "c7aca1d7e1066a79a26ece7807f34dd97b0a410d2ba88b34d3b703e3522b54ba",
-                    "nonce" : "5511ca6fcae50d84",
+                    "hash" : "0xe84900a472ce90e57c0c63e5ad055f0007d3c336a851cfe00b5d5beb455e09f1",
+                    "mixHash" : "0x9d6343b74dcab68543cd86701ebaaaf4dd48571c98e413b346687fb9b4cc788b",
+                    "nonce" : "0xa5935c6f8647e49d",
                     "number" : "0x01",
-                    "parentHash" : "8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
-                    "receiptTrie" : "abcaec009f7724bf2b67d023e33e50735945e12608689f75d7732eda2e32fe50",
-                    "stateRoot" : "26df46aa15a8d44f0ca7c8d726b816677b60caa8709620b22674aed532e10ce8",
+                    "parentHash" : "0x8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
+                    "receiptTrie" : "0xabcaec009f7724bf2b67d023e33e50735945e12608689f75d7732eda2e32fe50",
+                    "stateRoot" : "0x26df46aa15a8d44f0ca7c8d726b816677b60caa8709620b22674aed532e10ce8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a08e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa026df46aa15a8d44f0ca7c8d726b816677b60caa8709620b22674aed532e10ce8a02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a0abcaec009f7724bf2b67d023e33e50735945e12608689f75d7732eda2e32fe50b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008254df8203e880a0c7aca1d7e1066a79a26ece7807f34dd97b0a410d2ba88b34d3b703e3522b54ba885511ca6fcae50d84f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a08e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa026df46aa15a8d44f0ca7c8d726b816677b60caa8709620b22674aed532e10ce8a02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a0abcaec009f7724bf2b67d023e33e50735945e12608689f75d7732eda2e32fe50b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008254df8203e880a09d6343b74dcab68543cd86701ebaaaf4dd48571c98e413b346687fb9b4cc788b88a5935c6f8647e49df861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7530",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bf",
                         "s" : "0x53a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1db",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -139,60 +149,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "eecf2d4085548a36784013b5c7212977f3462813adecfe55353ca2a5f9f87597",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xeecf2d4085548a36784013b5c7212977f3462813adecfe55353ca2a5f9f87597",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eecf2d4085548a36784013b5c7212977f3462813adecfe55353ca2a5f9f87597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "48d0e82e223ef7be3e35dd5c2c0973786c60702fc86c90f0a42135e70c1620ad",
+        "lastblockhash" : "0xe84900a472ce90e57c0c63e5ad055f0007d3c336a851cfe00b5d5beb455e09f1",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001611770f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f454df",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a763ab21",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001611770f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -200,36 +210,41 @@
         }
     },
     "call_OOG_additionalGasCosts1_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/call_OOG_additionalGasCosts1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x7530",
-                    "hash" : "0fb3218d22e82cc7dda77587c0d78fab95e7c80980b9c1f057c85d15ad477d14",
-                    "mixHash" : "4fa4f5937d383a69fe994370ca8abb6fe1ed792e1d23e2abd4bf742b9bcfae88",
-                    "nonce" : "430734103c057c84",
+                    "hash" : "0xf3bab2faa565b4d6fbcb0209757600d0782298b14f3e2047d2a878b87be3ca9f",
+                    "mixHash" : "0x712dd15495f4b8be9b09c1e22c00ab87fe49572938d7f9de2ed2cb36cb11b6d5",
+                    "nonce" : "0xde09f093712fef06",
                     "number" : "0x01",
-                    "parentHash" : "8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
-                    "receiptTrie" : "5cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9",
-                    "stateRoot" : "74794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9",
+                    "parentHash" : "0x8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
+                    "receiptTrie" : "0x5cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9",
+                    "stateRoot" : "0x74794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a08e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9a02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a05cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a04fa4f5937d383a69fe994370ca8abb6fe1ed792e1d23e2abd4bf742b9bcfae8888430734103c057c84f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a08e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9a02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a05cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a0712dd15495f4b8be9b09c1e22c00ab87fe49572938d7f9de2ed2cb36cb11b6d588de09f093712fef06f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7530",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bf",
                         "s" : "0x53a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1db",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -239,60 +254,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "eecf2d4085548a36784013b5c7212977f3462813adecfe55353ca2a5f9f87597",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xeecf2d4085548a36784013b5c7212977f3462813adecfe55353ca2a5f9f87597",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eecf2d4085548a36784013b5c7212977f3462813adecfe55353ca2a5f9f87597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0fb3218d22e82cc7dda77587c0d78fab95e7c80980b9c1f057c85d15ad477d14",
+        "lastblockhash" : "0xf3bab2faa565b4d6fbcb0209757600d0782298b14f3e2047d2a878b87be3ca9f",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001611770f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f47530",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7638ad0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001611770f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -300,36 +315,41 @@
         }
     },
     "call_OOG_additionalGasCosts1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/call_OOG_additionalGasCosts1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x7530",
-                    "hash" : "2f19e365f5ba0154eca794dd3aacf10cbf721f4e8d3c630591493f6a85374ff5",
-                    "mixHash" : "44b994a1e9eda6037a27039549355e7a5e483f431fb1a8a64513c0201089b8fd",
-                    "nonce" : "42e12f282a4fb0a3",
+                    "hash" : "0x5f4ba9ffd355e6891cd1568d4d0fd02dc5c0d7d2ada3b0d758592d122b599252",
+                    "mixHash" : "0x72cc569078a9583dd5f832998e2f9d185f5f98aef579fe8bc40d3533c130be5b",
+                    "nonce" : "0x244f116309b31991",
                     "number" : "0x01",
-                    "parentHash" : "8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
-                    "receiptTrie" : "5cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9",
-                    "stateRoot" : "74794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9",
+                    "parentHash" : "0x8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
+                    "receiptTrie" : "0x5cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9",
+                    "stateRoot" : "0x74794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a08e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9a02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a05cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a044b994a1e9eda6037a27039549355e7a5e483f431fb1a8a64513c0201089b8fd8842e12f282a4fb0a3f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a08e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9a02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a05cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a072cc569078a9583dd5f832998e2f9d185f5f98aef579fe8bc40d3533c130be5b88244f116309b31991f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7530",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bf",
                         "s" : "0x53a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1db",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -339,60 +359,172 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "eecf2d4085548a36784013b5c7212977f3462813adecfe55353ca2a5f9f87597",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xeecf2d4085548a36784013b5c7212977f3462813adecfe55353ca2a5f9f87597",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eecf2d4085548a36784013b5c7212977f3462813adecfe55353ca2a5f9f87597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2f19e365f5ba0154eca794dd3aacf10cbf721f4e8d3c630591493f6a85374ff5",
+        "lastblockhash" : "0x5f4ba9ffd355e6891cd1568d4d0fd02dc5c0d7d2ada3b0d758592d122b599252",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001611770f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f47530",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7638ad0",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001611770f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "call_OOG_additionalGasCosts1_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/call_OOG_additionalGasCosts1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0xb2d05e00",
+                    "gasUsed" : "0x54df",
+                    "hash" : "0x107fd0631562959f2f4e5bed1f1e81e6bd5949bab8dc61d12de02d9e12cb3262",
+                    "mixHash" : "0x874c556bf375a06fb97f538e3904157276a15443f42754d9a13d6cd91c77c1aa",
+                    "nonce" : "0xc472a4fff40cac08",
+                    "number" : "0x01",
+                    "parentHash" : "0x8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
+                    "receiptTrie" : "0x1f31c35fb78fd0f3cc866e3c0901931fd9fcc6dee874682656f1a3cf39f92c25",
+                    "stateRoot" : "0xe212be0e550e41f8f0ca08312547409d5b8b3530ec3d9b91fbfb442cf2df01d6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f8a08e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e212be0e550e41f8f0ca08312547409d5b8b3530ec3d9b91fbfb442cf2df01d6a02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a01f31c35fb78fd0f3cc866e3c0901931fd9fcc6dee874682656f1a3cf39f92c25b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008254df8203e880a0874c556bf375a06fb97f538e3904157276a15443f42754d9a13d6cd91c77c1aa88c472a4fff40cac08f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "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" : "0x107fd0631562959f2f4e5bed1f1e81e6bd5949bab8dc61d12de02d9e12cb3262",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001611770f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f454df",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a763ab21",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001611770f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2.json b/BlockchainTests/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0.json
index a88dcc962..34739f36b 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "call_OOG_additionalGasCosts2_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x7530",
-                    "hash" : "b0dfd48ac2bd0e9c61b5b0224e0964d683ef8b45666091f244a8df5f57770c5d",
-                    "mixHash" : "ec4393d49d934661d1475bb866f6a3ba982665e57951f7d4e2825101d5ac900c",
-                    "nonce" : "409b52777bab9d98",
+                    "hash" : "0x92e5828bbb8c06038b5dcbd73a849e23517e1665ccb96fa176981bd1d449f0c1",
+                    "mixHash" : "0xe40821f15e6e960a4047d43d376c6b5644b7bb3406af350128287288dfaf4465",
+                    "nonce" : "0xb90ea8fabeaf796a",
                     "number" : "0x01",
-                    "parentHash" : "eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
-                    "receiptTrie" : "7f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbb",
-                    "stateRoot" : "43446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671a",
+                    "parentHash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
+                    "receiptTrie" : "0x7f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbb",
+                    "stateRoot" : "0x43446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a0ec4393d49d934661d1475bb866f6a3ba982665e57951f7d4e2825101d5ac900c88409b52777bab9d98f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a0e40821f15e6e960a4047d43d376c6b5644b7bb3406af350128287288dfaf446588b90ea8fabeaf796af861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7530",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bf",
                         "s" : "0x53a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1db",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,74 +44,74 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b0dfd48ac2bd0e9c61b5b0224e0964d683ef8b45666091f244a8df5f57770c5d",
+        "lastblockhash" : "0x92e5828bbb8c06038b5dcbd73a849e23517e1665ccb96fa176981bd1d449f0c1",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001611770f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f47530",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7638ad0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001611770f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -114,36 +119,41 @@
         }
     },
     "call_OOG_additionalGasCosts2_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x7530",
-                    "hash" : "37e0d3f10ca2ff74313806bf2e51faaca55d691a812de39b8cf5a90453efd641",
-                    "mixHash" : "2acc7b8780aa04111b82bf944c1d912149db8fc76239a6e69ba7395c2c448785",
-                    "nonce" : "418b9c05adcfdfd3",
+                    "hash" : "0x29afa1b6b06b5c8825223010072ad8913c41d7435c415673c7f22a71cb985990",
+                    "mixHash" : "0x4aebcb8c56c9d986e29bc71601990178dbb901da899451bc433c4734aaa048bc",
+                    "nonce" : "0xedab729c7b7ee061",
                     "number" : "0x01",
-                    "parentHash" : "eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
-                    "receiptTrie" : "7f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbb",
-                    "stateRoot" : "43446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671a",
+                    "parentHash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
+                    "receiptTrie" : "0x7f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbb",
+                    "stateRoot" : "0x43446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a02acc7b8780aa04111b82bf944c1d912149db8fc76239a6e69ba7395c2c44878588418b9c05adcfdfd3f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a04aebcb8c56c9d986e29bc71601990178dbb901da899451bc433c4734aaa048bc88edab729c7b7ee061f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7530",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bf",
                         "s" : "0x53a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1db",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -153,74 +163,74 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "37e0d3f10ca2ff74313806bf2e51faaca55d691a812de39b8cf5a90453efd641",
+        "lastblockhash" : "0x29afa1b6b06b5c8825223010072ad8913c41d7435c415673c7f22a71cb985990",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001611770f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f47530",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7638ad0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001611770f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -228,36 +238,41 @@
         }
     },
     "call_OOG_additionalGasCosts2_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x7530",
-                    "hash" : "cdcdce785ed13e4f6bff061728ccb471c46c0561f39cac1965827de8fb4e9e5f",
-                    "mixHash" : "36c83ce8b7c3f6c0c5989c9f92cb74d0a760e648cf794f80942eb62149afef9c",
-                    "nonce" : "64e8f02f58d4b7a5",
+                    "hash" : "0x73f432da5724f1f8ae0952d2ccbff33ae8da91c4d87cd40dd0229e2339009992",
+                    "mixHash" : "0x6f16c1a4949226c04088c9d846200fc3cd41c90dcd19289d46c779ece5ade916",
+                    "nonce" : "0x35a8cdb995caf979",
                     "number" : "0x01",
-                    "parentHash" : "eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
-                    "receiptTrie" : "7f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbb",
-                    "stateRoot" : "43446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671a",
+                    "parentHash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
+                    "receiptTrie" : "0x7f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbb",
+                    "stateRoot" : "0x43446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a036c83ce8b7c3f6c0c5989c9f92cb74d0a760e648cf794f80942eb62149afef9c8864e8f02f58d4b7a5f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a06f16c1a4949226c04088c9d846200fc3cd41c90dcd19289d46c779ece5ade9168835a8cdb995caf979f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7530",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bf",
                         "s" : "0x53a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1db",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -267,74 +282,74 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "cdcdce785ed13e4f6bff061728ccb471c46c0561f39cac1965827de8fb4e9e5f",
+        "lastblockhash" : "0x73f432da5724f1f8ae0952d2ccbff33ae8da91c4d87cd40dd0229e2339009992",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001611770f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f47530",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7638ad0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001611770f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -342,36 +357,41 @@
         }
     },
     "call_OOG_additionalGasCosts2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x7530",
-                    "hash" : "f8280d5f2d67969428f5ae9539e4c6924f620f5a125ac4c190f4dd9cef1f05e3",
-                    "mixHash" : "c0b44428b09478ae11944b9d1d31d15a1c576ee179a73943f910e672267454ca",
-                    "nonce" : "ea25f19f975f87ff",
+                    "hash" : "0xed149c5175ec3d855b07156dc8587216a5b7a25580abdb14a114794b3b3afb5d",
+                    "mixHash" : "0x1405c27216e0294ad1e6731b13406a88178c532a4d14d08006edd48ef9ddad90",
+                    "nonce" : "0x3bae88891d7b7762",
                     "number" : "0x01",
-                    "parentHash" : "eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
-                    "receiptTrie" : "7f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbb",
-                    "stateRoot" : "43446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671a",
+                    "parentHash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
+                    "receiptTrie" : "0x7f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbb",
+                    "stateRoot" : "0x43446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a0c0b44428b09478ae11944b9d1d31d15a1c576ee179a73943f910e672267454ca88ea25f19f975f87fff861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a01405c27216e0294ad1e6731b13406a88178c532a4d14d08006edd48ef9ddad90883bae88891d7b7762f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7530",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bf",
                         "s" : "0x53a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1db",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -381,74 +401,200 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f8280d5f2d67969428f5ae9539e4c6924f620f5a125ac4c190f4dd9cef1f05e3",
+        "lastblockhash" : "0xed149c5175ec3d855b07156dc8587216a5b7a25580abdb14a114794b3b3afb5d",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x91a9beb6f71f37769d7246ee057fed5590b5fb2f1600c9ac130a49cd53c265e8",
+                    "mixHash" : "0x2e16d218dbbcb8b9e865468fd554084037887ea7df3409c0f3334fad6694ae31",
+                    "nonce" : "0xf21ce94c3ef2879e",
+                    "number" : "0x01",
+                    "parentHash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
+                    "receiptTrie" : "0x534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0b",
+                    "stateRoot" : "0xd27f75c01540cadf6449a5c2f3db41a5fbeac9f7f5963db08e137d5e30a803ec",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d27f75c01540cadf6449a5c2f3db41a5fbeac9f7f5963db08e137d5e30a803eca02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a0534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a02e16d218dbbcb8b9e865468fd554084037887ea7df3409c0f3334fad6694ae3188f21ce94c3ef2879ef861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "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" : "0x91a9beb6f71f37769d7246ee057fed5590b5fb2f1600c9ac130a49cd53c265e8",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001611770f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f47530",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7638ad0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001611770f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_d0g0v0.json
index 4a4c9d7f8..be8275b35 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcall_00_OOGE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010798",
-                    "hash" : "9d9545faa95b8e6f8e7eb1f42f18a9ef26124a4c662b3ca376956f047c3fc16b",
-                    "mixHash" : "de995a6f71a6b564886ec4467db1dfa459f7245cf8882277b2a3e297fc6092e2",
-                    "nonce" : "9e2002e40cc69940",
+                    "hash" : "0xb137364ce868312c8c65079853f71a2f19817ebf2039b6025f94ce7ba19f9bf8",
+                    "mixHash" : "0xcbccccdaf0a4ba7acd018e8dba033360c7f12b7ee699b062257b475394d76c0f",
+                    "nonce" : "0xa989e1f558e5f950",
                     "number" : "0x01",
-                    "parentHash" : "0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
-                    "receiptTrie" : "220f7b3978b9aff403a01d0d3dd6f804f9679970965d2ee37d7806ad36968769",
-                    "stateRoot" : "98378960c186988a90a8eea21c10fbd4ab6ec3db98a38bfaa030d69dd42d3d07",
+                    "parentHash" : "0x0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
+                    "receiptTrie" : "0x220f7b3978b9aff403a01d0d3dd6f804f9679970965d2ee37d7806ad36968769",
+                    "stateRoot" : "0x98378960c186988a90a8eea21c10fbd4ab6ec3db98a38bfaa030d69dd42d3d07",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa098378960c186988a90a8eea21c10fbd4ab6ec3db98a38bfaa030d69dd42d3d07a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0220f7b3978b9aff403a01d0d3dd6f804f9679970965d2ee37d7806ad36968769b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0de995a6f71a6b564886ec4467db1dfa459f7245cf8882277b2a3e297fc6092e2889e2002e40cc69940f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa098378960c186988a90a8eea21c10fbd4ab6ec3db98a38bfaa030d69dd42d3d07a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0220f7b3978b9aff403a01d0d3dd6f804f9679970965d2ee37d7806ad36968769b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0cbccccdaf0a4ba7acd018e8dba033360c7f12b7ee699b062257b475394d76c0f88a989e1f558e5f950f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "5cd3320021cc290720486bc424145b3e442f31f7a70e4235cf0ac8ba371e4347",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5cd3320021cc290720486bc424145b3e442f31f7a70e4235cf0ac8ba371e4347",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05cd3320021cc290720486bc424145b3e442f31f7a70e4235cf0ac8ba371e4347a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9d9545faa95b8e6f8e7eb1f42f18a9ef26124a4c662b3ca376956f047c3fc16b",
+        "lastblockhash" : "0xb137364ce868312c8c65079853f71a2f19817ebf2039b6025f94ce7ba19f9bf8",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -68,60 +73,60 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f50798",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762f868",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -129,36 +134,41 @@
         }
     },
     "callcall_00_OOGE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010798",
-                    "hash" : "62ec7b99fdb2b8927b7fa1a728ca7371c19b7665eba2f336cfb338668071e643",
-                    "mixHash" : "dfeec8008c58d1739d6c46bc206615a2c13928ed8109e1d39c04dc97c732417d",
-                    "nonce" : "a62118351b82bca6",
+                    "hash" : "0x28aae3c0fc6df5fc4d79da80a6754d5e54696cf0a67d2bbca9b49c3757d4f92f",
+                    "mixHash" : "0x02404e2aa1de2b4f02c0002447c071f9073307991daa4762f9b2ac0c1173ea52",
+                    "nonce" : "0x1e700e6655d7b653",
                     "number" : "0x01",
-                    "parentHash" : "0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
-                    "receiptTrie" : "220f7b3978b9aff403a01d0d3dd6f804f9679970965d2ee37d7806ad36968769",
-                    "stateRoot" : "98378960c186988a90a8eea21c10fbd4ab6ec3db98a38bfaa030d69dd42d3d07",
+                    "parentHash" : "0x0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
+                    "receiptTrie" : "0x220f7b3978b9aff403a01d0d3dd6f804f9679970965d2ee37d7806ad36968769",
+                    "stateRoot" : "0x98378960c186988a90a8eea21c10fbd4ab6ec3db98a38bfaa030d69dd42d3d07",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa098378960c186988a90a8eea21c10fbd4ab6ec3db98a38bfaa030d69dd42d3d07a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0220f7b3978b9aff403a01d0d3dd6f804f9679970965d2ee37d7806ad36968769b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0dfeec8008c58d1739d6c46bc206615a2c13928ed8109e1d39c04dc97c732417d88a62118351b82bca6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa098378960c186988a90a8eea21c10fbd4ab6ec3db98a38bfaa030d69dd42d3d07a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0220f7b3978b9aff403a01d0d3dd6f804f9679970965d2ee37d7806ad36968769b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a002404e2aa1de2b4f02c0002447c071f9073307991daa4762f9b2ac0c1173ea52881e700e6655d7b653f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -168,28 +178,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "5cd3320021cc290720486bc424145b3e442f31f7a70e4235cf0ac8ba371e4347",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5cd3320021cc290720486bc424145b3e442f31f7a70e4235cf0ac8ba371e4347",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05cd3320021cc290720486bc424145b3e442f31f7a70e4235cf0ac8ba371e4347a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "62ec7b99fdb2b8927b7fa1a728ca7371c19b7665eba2f336cfb338668071e643",
+        "lastblockhash" : "0x28aae3c0fc6df5fc4d79da80a6754d5e54696cf0a67d2bbca9b49c3757d4f92f",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -197,60 +207,60 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f50798",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762f868",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -258,36 +268,41 @@
         }
     },
     "callcall_00_OOGE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010270",
-                    "hash" : "a9d2e1c7c7c7ceb0446c8928bfd491c739a6220a6c3d8ae0e5995430eb1ee81e",
-                    "mixHash" : "ea4b69c70f732b2560c6834e1d84bde856e3f516c943bf5f4589492ca2452892",
-                    "nonce" : "b6b00ab353959ca8",
+                    "hash" : "0x9709c05ada5172a0a55a8c49c13e040bf23199999d488c47b6ccf650ba68b734",
+                    "mixHash" : "0xcc76feb21d2e42238f9cc59a314b1c2ea3cbb433641c8e34495ff711c1d48a99",
+                    "nonce" : "0x7cc2cfa5268e8b14",
                     "number" : "0x01",
-                    "parentHash" : "0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
-                    "receiptTrie" : "4a7cdb2c2a856c97a978a7739c87a98490743b723463befd42b3de365cdc2903",
-                    "stateRoot" : "85081610b5b467d98fde2030a8124ead8f5ae6ec905d75345b3343e7e50e1dba",
+                    "parentHash" : "0x0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
+                    "receiptTrie" : "0x4a7cdb2c2a856c97a978a7739c87a98490743b723463befd42b3de365cdc2903",
+                    "stateRoot" : "0x85081610b5b467d98fde2030a8124ead8f5ae6ec905d75345b3343e7e50e1dba",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa085081610b5b467d98fde2030a8124ead8f5ae6ec905d75345b3343e7e50e1dbaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04a7cdb2c2a856c97a978a7739c87a98490743b723463befd42b3de365cdc2903b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a0ea4b69c70f732b2560c6834e1d84bde856e3f516c943bf5f4589492ca245289288b6b00ab353959ca8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa085081610b5b467d98fde2030a8124ead8f5ae6ec905d75345b3343e7e50e1dbaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04a7cdb2c2a856c97a978a7739c87a98490743b723463befd42b3de365cdc2903b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a0cc76feb21d2e42238f9cc59a314b1c2ea3cbb433641c8e34495ff711c1d48a99887cc2cfa5268e8b14f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -297,28 +312,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "5cd3320021cc290720486bc424145b3e442f31f7a70e4235cf0ac8ba371e4347",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5cd3320021cc290720486bc424145b3e442f31f7a70e4235cf0ac8ba371e4347",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05cd3320021cc290720486bc424145b3e442f31f7a70e4235cf0ac8ba371e4347a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a9d2e1c7c7c7ceb0446c8928bfd491c739a6220a6c3d8ae0e5995430eb1ee81e",
+        "lastblockhash" : "0x9709c05ada5172a0a55a8c49c13e040bf23199999d488c47b6ccf650ba68b734",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -326,60 +341,60 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f50270",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762fd90",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -387,36 +402,41 @@
         }
     },
     "callcall_00_OOGE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010270",
-                    "hash" : "cc3c093fdd5be8ee2e6fa9fda535acf2e427ccfe485a853c0c8f111bde7e6a0d",
-                    "mixHash" : "52eb3d242fa93ee42f0ea3f6880b0f64a0c45698ab1ba2f4460a8729ed802f34",
-                    "nonce" : "141ce042eb3f2dcb",
+                    "hash" : "0xe6565db1efb17fac6a6039a18f0cc51dc33ca25e17432478619dd99dccb356ce",
+                    "mixHash" : "0xbe1de2757a149c1c8957bf6660f3d2e189df3082ff1dbfbe3c514089dab4e75d",
+                    "nonce" : "0x56667240125055cc",
                     "number" : "0x01",
-                    "parentHash" : "0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
-                    "receiptTrie" : "4a7cdb2c2a856c97a978a7739c87a98490743b723463befd42b3de365cdc2903",
-                    "stateRoot" : "85081610b5b467d98fde2030a8124ead8f5ae6ec905d75345b3343e7e50e1dba",
+                    "parentHash" : "0x0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
+                    "receiptTrie" : "0x4a7cdb2c2a856c97a978a7739c87a98490743b723463befd42b3de365cdc2903",
+                    "stateRoot" : "0x85081610b5b467d98fde2030a8124ead8f5ae6ec905d75345b3343e7e50e1dba",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa085081610b5b467d98fde2030a8124ead8f5ae6ec905d75345b3343e7e50e1dbaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04a7cdb2c2a856c97a978a7739c87a98490743b723463befd42b3de365cdc2903b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a052eb3d242fa93ee42f0ea3f6880b0f64a0c45698ab1ba2f4460a8729ed802f3488141ce042eb3f2dcbf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa085081610b5b467d98fde2030a8124ead8f5ae6ec905d75345b3343e7e50e1dbaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04a7cdb2c2a856c97a978a7739c87a98490743b723463befd42b3de365cdc2903b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a0be1de2757a149c1c8957bf6660f3d2e189df3082ff1dbfbe3c514089dab4e75d8856667240125055ccf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -426,28 +446,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "5cd3320021cc290720486bc424145b3e442f31f7a70e4235cf0ac8ba371e4347",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5cd3320021cc290720486bc424145b3e442f31f7a70e4235cf0ac8ba371e4347",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05cd3320021cc290720486bc424145b3e442f31f7a70e4235cf0ac8ba371e4347a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "cc3c093fdd5be8ee2e6fa9fda535acf2e427ccfe485a853c0c8f111bde7e6a0d",
+        "lastblockhash" : "0xe6565db1efb17fac6a6039a18f0cc51dc33ca25e17432478619dd99dccb356ce",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -455,60 +475,201 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f50270",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762fd90",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xbec8993df50ef6b49393e6dd19562d20800c7dbd7706a90db8200cd62f6813af",
+                    "mixHash" : "0x4e5f21dc16a8a6b68572b45e8c42df54183252a3d55ff9607695d1b061fca28f",
+                    "nonce" : "0x37ba4c5f43ac809c",
+                    "number" : "0x01",
+                    "parentHash" : "0x0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
+                    "receiptTrie" : "0xfca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834",
+                    "stateRoot" : "0xb6126ffb510bf0abe100a54417b0ee6d468ef6a46a64bb9d659ad4b939cad800",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a00379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6126ffb510bf0abe100a54417b0ee6d468ef6a46a64bb9d659ad4b939cad800a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a04e5f21dc16a8a6b68572b45e8c42df54183252a3d55ff9607695d1b061fca28f8837ba4c5f43ac809cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0xbec8993df50ef6b49393e6dd19562d20800c7dbd7706a90db8200cd62f6813af",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer.json
deleted file mode 100644
index b56938f6a..000000000
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer.json
+++ /dev/null
@@ -1,1030 +0,0 @@
-{
-    "callcall_00_OOGE_valueTransfer_d0g0v0_EIP150" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf9bb",
-                    "hash" : "b2966ee3a38a347a58a259eb7c9266e72a8e12819ff1f408e0d040149ad78a66",
-                    "mixHash" : "1c62061798d6d3cc18dc36a7f3440d8dd84177301013bb5992bfd96a9b83036d",
-                    "nonce" : "831e7265d918046c",
-                    "number" : "0x01",
-                    "parentHash" : "2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-                    "receiptTrie" : "0dde607a96c1c9e858889c41769ff4b7748f4c265450845fce50e4e8cef3ae6f",
-                    "stateRoot" : "15920350ea0fb62e6140ece8143598e4a8a2aeaabc11a5571e7c879ed895a838",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "8996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90280f901f8a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015920350ea0fb62e6140ece8143598e4a8a2aeaabc11a5571e7c879ed895a838a08996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631ba00dde607a96c1c9e858889c41769ff4b7748f4c265450845fce50e4e8cef3ae6fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f9bb8203e880a01c62061798d6d3cc18dc36a7f3440d8dd84177301013bb5992bfd96a9b83036d88831e7265d918046cf882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000001f41ba020bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3ca057b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800c0",
-                "transactions" : [
-                    {
-                        "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
-                        "gasLimit" : "0x029fe0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x20bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3c",
-                        "s" : "0x57b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b2966ee3a38a347a58a259eb7c9266e72a8e12819ff1f408e0d040149ad78a66",
-        "network" : "EIP150",
-        "postState" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a763ffec",
-                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x14",
-                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f9bb",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630645",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcall_00_OOGE_valueTransfer_d0g0v0_EIP158" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf9bb",
-                    "hash" : "363fa6bdc8528ce2e060d1ce6d9d021440d25ee548afc5fe13732e7cfe708719",
-                    "mixHash" : "0af729266694bf314de763e6e20b9b98960ebea2193af6dcc033a7dd3807978a",
-                    "nonce" : "70fc6016badc14e1",
-                    "number" : "0x01",
-                    "parentHash" : "2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-                    "receiptTrie" : "0dde607a96c1c9e858889c41769ff4b7748f4c265450845fce50e4e8cef3ae6f",
-                    "stateRoot" : "15920350ea0fb62e6140ece8143598e4a8a2aeaabc11a5571e7c879ed895a838",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "8996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90280f901f8a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015920350ea0fb62e6140ece8143598e4a8a2aeaabc11a5571e7c879ed895a838a08996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631ba00dde607a96c1c9e858889c41769ff4b7748f4c265450845fce50e4e8cef3ae6fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f9bb8203e880a00af729266694bf314de763e6e20b9b98960ebea2193af6dcc033a7dd3807978a8870fc6016badc14e1f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000001f41ba020bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3ca057b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800c0",
-                "transactions" : [
-                    {
-                        "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
-                        "gasLimit" : "0x029fe0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x20bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3c",
-                        "s" : "0x57b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "363fa6bdc8528ce2e060d1ce6d9d021440d25ee548afc5fe13732e7cfe708719",
-        "network" : "EIP158",
-        "postState" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a763ffec",
-                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x14",
-                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f9bb",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630645",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcall_00_OOGE_valueTransfer_d0g0v0_Frontier" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x029fe0",
-                    "hash" : "008b8d6df63978a7cbd2398563c28226a4b1194eaf3439c535403a6f4380ee5a",
-                    "mixHash" : "fc7303e745b90cdcaa714a545548f710658b9247bf687430b4720926451ba108",
-                    "nonce" : "cd2fd92446df398f",
-                    "number" : "0x01",
-                    "parentHash" : "2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-                    "receiptTrie" : "092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1",
-                    "stateRoot" : "9b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "8996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7a08996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631ba0092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0fc7303e745b90cdcaa714a545548f710658b9247bf687430b4720926451ba10888cd2fd92446df398ff882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000001f41ba020bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3ca057b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800c0",
-                "transactions" : [
-                    {
-                        "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
-                        "gasLimit" : "0x029fe0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x20bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3c",
-                        "s" : "0x57b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "008b8d6df63978a7cbd2398563c28226a4b1194eaf3439c535403a6f4380ee5a",
-        "network" : "Frontier",
-        "postState" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f69fe0",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616020",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcall_00_OOGE_valueTransfer_d0g0v0_Homestead" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x029fe0",
-                    "hash" : "692ab5295d6f7d4c62f9f4c9ce443b87996fa7241a1e86042950039170704299",
-                    "mixHash" : "27c0a5f27d8b63572c80ba06995ab864718335aeaa3aa101c9509f1d0ee5e18d",
-                    "nonce" : "29a30f2de3d434ab",
-                    "number" : "0x01",
-                    "parentHash" : "2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-                    "receiptTrie" : "092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1",
-                    "stateRoot" : "9b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "8996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7a08996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631ba0092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a027c0a5f27d8b63572c80ba06995ab864718335aeaa3aa101c9509f1d0ee5e18d8829a30f2de3d434abf882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000001f41ba020bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3ca057b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800c0",
-                "transactions" : [
-                    {
-                        "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
-                        "gasLimit" : "0x029fe0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x20bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3c",
-                        "s" : "0x57b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "692ab5295d6f7d4c62f9f4c9ce443b87996fa7241a1e86042950039170704299",
-        "network" : "Homestead",
-        "postState" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f69fe0",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616020",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcall_00_OOGE_valueTransfer_d1g0v0_EIP150" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x010b4f",
-                    "hash" : "a499a6f9d2e7d5d5faebec1277c357de48cc38d19ecc4dd81b98d8cb3837973d",
-                    "mixHash" : "fa5bab81735459cacd68d9af51d4538e324254692c626948660c05f1fe67b56c",
-                    "nonce" : "ba6aef5b037c4284",
-                    "number" : "0x01",
-                    "parentHash" : "2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-                    "receiptTrie" : "6a90697ee4f70cf02d574101a4704d5d22090af674831e2ecae08c63e7637e45",
-                    "stateRoot" : "4d3a54d5fcddae7e73c98a040fb644445890a8b2718f2d9f8f8cd9e02ed8d5ad",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04d3a54d5fcddae7e73c98a040fb644445890a8b2718f2d9f8f8cd9e02ed8d5ada0076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114a06a90697ee4f70cf02d574101a4704d5d22090af674831e2ecae08c63e7637e45b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083010b4f8203e880a0fa5bab81735459cacd68d9af51d4538e324254692c626948660c05f1fe67b56c88ba6aef5b037c4284f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000013881ca0c10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506a073f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187c0",
-                "transactions" : [
-                    {
-                        "data" : "0x0000000000000000000000000000000000000000000000000000000000001388",
-                        "gasLimit" : "0x029fe0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506",
-                        "s" : "0x73f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a499a6f9d2e7d5d5faebec1277c357de48cc38d19ecc4dd81b98d8cb3837973d",
-        "network" : "EIP150",
-        "postState" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a763ffec",
-                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x14",
-                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50b4f",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762f4b1",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcall_00_OOGE_valueTransfer_d1g0v0_EIP158" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x010b4f",
-                    "hash" : "30863e91d9206a8e1f902e86bd75a3ab3ddf537fe0d525b93225fd319e1bfef9",
-                    "mixHash" : "2db492cae4b14e1a0b80c8d38f8f2763b4a543024ad1ad75e117969ab0355ec7",
-                    "nonce" : "805a7fdb34c92dd2",
-                    "number" : "0x01",
-                    "parentHash" : "2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-                    "receiptTrie" : "6a90697ee4f70cf02d574101a4704d5d22090af674831e2ecae08c63e7637e45",
-                    "stateRoot" : "4d3a54d5fcddae7e73c98a040fb644445890a8b2718f2d9f8f8cd9e02ed8d5ad",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04d3a54d5fcddae7e73c98a040fb644445890a8b2718f2d9f8f8cd9e02ed8d5ada0076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114a06a90697ee4f70cf02d574101a4704d5d22090af674831e2ecae08c63e7637e45b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083010b4f8203e880a02db492cae4b14e1a0b80c8d38f8f2763b4a543024ad1ad75e117969ab0355ec788805a7fdb34c92dd2f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000013881ca0c10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506a073f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187c0",
-                "transactions" : [
-                    {
-                        "data" : "0x0000000000000000000000000000000000000000000000000000000000001388",
-                        "gasLimit" : "0x029fe0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506",
-                        "s" : "0x73f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "30863e91d9206a8e1f902e86bd75a3ab3ddf537fe0d525b93225fd319e1bfef9",
-        "network" : "EIP158",
-        "postState" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a763ffec",
-                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x14",
-                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50b4f",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762f4b1",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcall_00_OOGE_valueTransfer_d1g0v0_Frontier" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x029fe0",
-                    "hash" : "09128c2928bff2b39bfde7f727be7bcc35d593e9db3184094c2c5f43740ba276",
-                    "mixHash" : "082ad8cb020b28e3bf7c376a035da4c941b1867bee5ea72e47123ce5c69d58df",
-                    "nonce" : "ee323a79529a5ab3",
-                    "number" : "0x01",
-                    "parentHash" : "2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-                    "receiptTrie" : "092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1",
-                    "stateRoot" : "9b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7a0076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114a0092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0082ad8cb020b28e3bf7c376a035da4c941b1867bee5ea72e47123ce5c69d58df88ee323a79529a5ab3f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000013881ca0c10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506a073f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187c0",
-                "transactions" : [
-                    {
-                        "data" : "0x0000000000000000000000000000000000000000000000000000000000001388",
-                        "gasLimit" : "0x029fe0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506",
-                        "s" : "0x73f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "09128c2928bff2b39bfde7f727be7bcc35d593e9db3184094c2c5f43740ba276",
-        "network" : "Frontier",
-        "postState" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f69fe0",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616020",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcall_00_OOGE_valueTransfer_d1g0v0_Homestead" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x029fe0",
-                    "hash" : "d946504d76686414c1ec0596733fdf499e7b5ab7388f68b64c87ea0a60ff7ed6",
-                    "mixHash" : "4856f7bc920e353452a10230e4f4f4fdfe4e4cc879857e1fae744499e189d1f5",
-                    "nonce" : "87c13486bac7417d",
-                    "number" : "0x01",
-                    "parentHash" : "2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-                    "receiptTrie" : "092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1",
-                    "stateRoot" : "9b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7a0076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114a0092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a04856f7bc920e353452a10230e4f4f4fdfe4e4cc879857e1fae744499e189d1f58887c13486bac7417df882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000013881ca0c10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506a073f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187c0",
-                "transactions" : [
-                    {
-                        "data" : "0x0000000000000000000000000000000000000000000000000000000000001388",
-                        "gasLimit" : "0x029fe0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506",
-                        "s" : "0x73f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d946504d76686414c1ec0596733fdf499e7b5ab7388f68b64c87ea0a60ff7ed6",
-        "network" : "Homestead",
-        "postState" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f69fe0",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616020",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer_d0g0v0.json
new file mode 100644
index 000000000..8e5c21f1b
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer_d0g0v0.json
@@ -0,0 +1,677 @@
+{
+    "callcall_00_OOGE_valueTransfer_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x831ebefa0c595add68880c89b43d19ce1945413337dcd672e43f03f64bafbe45",
+                    "mixHash" : "0x4edcbdc689953188096682651677d9ead6020a9e662f29697e1411d527fdfcac",
+                    "nonce" : "0xc247e32fab24f7cd",
+                    "number" : "0x01",
+                    "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
+                    "receiptTrie" : "0x0dde607a96c1c9e858889c41769ff4b7748f4c265450845fce50e4e8cef3ae6f",
+                    "stateRoot" : "0x15920350ea0fb62e6140ece8143598e4a8a2aeaabc11a5571e7c879ed895a838",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015920350ea0fb62e6140ece8143598e4a8a2aeaabc11a5571e7c879ed895a838a08996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631ba00dde607a96c1c9e858889c41769ff4b7748f4c265450845fce50e4e8cef3ae6fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f9bb8203e880a04edcbdc689953188096682651677d9ead6020a9e662f29697e1411d527fdfcac88c247e32fab24f7cdf882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000001f41ba020bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3ca057b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800c0",
+                "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" : "0x831ebefa0c595add68880c89b43d19ce1945413337dcd672e43f03f64bafbe45",
+        "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",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcall_00_OOGE_valueTransfer_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xc1617e1eaa910932782005e46667f03be537e83833fa2898b639c6c3c7f5f6c9",
+                    "mixHash" : "0xd59c963ee4b8605dde09092180c7466041bdd58e22f1154500a5fbfbdb9dd917",
+                    "nonce" : "0xe965350e8e89627b",
+                    "number" : "0x01",
+                    "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
+                    "receiptTrie" : "0x0dde607a96c1c9e858889c41769ff4b7748f4c265450845fce50e4e8cef3ae6f",
+                    "stateRoot" : "0x15920350ea0fb62e6140ece8143598e4a8a2aeaabc11a5571e7c879ed895a838",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015920350ea0fb62e6140ece8143598e4a8a2aeaabc11a5571e7c879ed895a838a08996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631ba00dde607a96c1c9e858889c41769ff4b7748f4c265450845fce50e4e8cef3ae6fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f9bb8203e880a0d59c963ee4b8605dde09092180c7466041bdd58e22f1154500a5fbfbdb9dd91788e965350e8e89627bf882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000001f41ba020bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3ca057b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800c0",
+                "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" : "0xc1617e1eaa910932782005e46667f03be537e83833fa2898b639c6c3c7f5f6c9",
+        "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" : "0x4563918244f4f9bb",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7630645",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcall_00_OOGE_valueTransfer_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x029fe0",
+                    "hash" : "0xf1b09bb415de82d60bcb2e832e1f9b109e2f9085913828fff3a58b483580b1a2",
+                    "mixHash" : "0x473c3f1c6d9134f816f45ba509632509e31d7428001e03fcc2a045736007cef7",
+                    "nonce" : "0x3cd80b19ecd1fd19",
+                    "number" : "0x01",
+                    "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
+                    "receiptTrie" : "0x092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1",
+                    "stateRoot" : "0x9b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7a08996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631ba0092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0473c3f1c6d9134f816f45ba509632509e31d7428001e03fcc2a045736007cef7883cd80b19ecd1fd19f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000001f41ba020bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3ca057b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800c0",
+                "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" : "0xf1b09bb415de82d60bcb2e832e1f9b109e2f9085913828fff3a58b483580b1a2",
+        "network" : "Frontier",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f69fe0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7616020",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcall_00_OOGE_valueTransfer_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x029fe0",
+                    "hash" : "0xe20df2b98a3febb2ad9f47dd65a46025406613e71f74a27f166de945012bf959",
+                    "mixHash" : "0xe26ebe42c64cbbdde88808263966a8c4d2371851f96ff0de1d8c63021798977f",
+                    "nonce" : "0xf4dfe99a091599d1",
+                    "number" : "0x01",
+                    "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
+                    "receiptTrie" : "0x092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1",
+                    "stateRoot" : "0x9b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7a08996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631ba0092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0e26ebe42c64cbbdde88808263966a8c4d2371851f96ff0de1d8c63021798977f88f4dfe99a091599d1f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000001f41ba020bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3ca057b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800c0",
+                "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" : "0xe20df2b98a3febb2ad9f47dd65a46025406613e71f74a27f166de945012bf959",
+        "network" : "Homestead",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f69fe0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7616020",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcall_00_OOGE_valueTransfer_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x17332bd70588bf27dda25015277800193a4c835baad78cfc981345bfd35ea341",
+                    "mixHash" : "0x4caeda7cc4b9698e5e265237d147148ec8c887b2acb720d53411600d46582697",
+                    "nonce" : "0x3586108de3e98438",
+                    "number" : "0x01",
+                    "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
+                    "receiptTrie" : "0x17bb47f6548c6139620913abeff601756131c332f8d908b7a748d4e8b277cbc7",
+                    "stateRoot" : "0xe6e8e37e713b8594a7e3245a21999bf6c4cff24bf4e7658da7e24c3723795a0b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e6e8e37e713b8594a7e3245a21999bf6c4cff24bf4e7658da7e24c3723795a0ba08996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631ba017bb47f6548c6139620913abeff601756131c332f8d908b7a748d4e8b277cbc7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f9bb8203e880a04caeda7cc4b9698e5e265237d147148ec8c887b2acb720d53411600d46582697883586108de3e98438f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000001f41ba020bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3ca057b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800c0",
+                "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" : "0x17332bd70588bf27dda25015277800193a4c835baad78cfc981345bfd35ea341",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "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",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer_d1g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer_d1g0v0.json
new file mode 100644
index 000000000..6c8a62124
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer_d1g0v0.json
@@ -0,0 +1,677 @@
+{
+    "callcall_00_OOGE_valueTransfer_d1g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xf2891a56fe380ac5e84f3130d2f5587324b358c6f32a96a2a6dbd6f55d4a1129",
+                    "mixHash" : "0x355a63fe0121b7d32ce55591bd6ed5dcfc646c8bce87e32003e543cd3a1b3eea",
+                    "nonce" : "0x68bfeec91a050b97",
+                    "number" : "0x01",
+                    "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
+                    "receiptTrie" : "0x6a90697ee4f70cf02d574101a4704d5d22090af674831e2ecae08c63e7637e45",
+                    "stateRoot" : "0x4d3a54d5fcddae7e73c98a040fb644445890a8b2718f2d9f8f8cd9e02ed8d5ad",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04d3a54d5fcddae7e73c98a040fb644445890a8b2718f2d9f8f8cd9e02ed8d5ada0076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114a06a90697ee4f70cf02d574101a4704d5d22090af674831e2ecae08c63e7637e45b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083010b4f8203e880a0355a63fe0121b7d32ce55591bd6ed5dcfc646c8bce87e32003e543cd3a1b3eea8868bfeec91a050b97f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000013881ca0c10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506a073f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187c0",
+                "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" : "0xf2891a56fe380ac5e84f3130d2f5587324b358c6f32a96a2a6dbd6f55d4a1129",
+        "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",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcall_00_OOGE_valueTransfer_d1g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x059bb5769e5528f549f89d91ebb8be67471dfed8207e6f354da52e4408da00cb",
+                    "mixHash" : "0x32bda5fe658b1fac44ceba93cc73711111f69a544efd8f5ed25845117ea1ab7d",
+                    "nonce" : "0x467e05c4e56b700e",
+                    "number" : "0x01",
+                    "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
+                    "receiptTrie" : "0x6a90697ee4f70cf02d574101a4704d5d22090af674831e2ecae08c63e7637e45",
+                    "stateRoot" : "0x4d3a54d5fcddae7e73c98a040fb644445890a8b2718f2d9f8f8cd9e02ed8d5ad",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04d3a54d5fcddae7e73c98a040fb644445890a8b2718f2d9f8f8cd9e02ed8d5ada0076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114a06a90697ee4f70cf02d574101a4704d5d22090af674831e2ecae08c63e7637e45b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083010b4f8203e880a032bda5fe658b1fac44ceba93cc73711111f69a544efd8f5ed25845117ea1ab7d88467e05c4e56b700ef882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000013881ca0c10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506a073f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187c0",
+                "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" : "0x059bb5769e5528f549f89d91ebb8be67471dfed8207e6f354da52e4408da00cb",
+        "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" : "0x4563918244f50b4f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762f4b1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcall_00_OOGE_valueTransfer_d1g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_OOGE_valueTransfer_d1g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x029fe0",
+                    "hash" : "0xfa48997aef79ae22b6161ac9e2d35ec29d07b565da3b35bde014c8dc0f985290",
+                    "mixHash" : "0xd59aaafd5303e4089f15819866c61c6d91e838407d277dd93069325ae1dfedc1",
+                    "nonce" : "0xb43dab6f0711e49b",
+                    "number" : "0x01",
+                    "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
+                    "receiptTrie" : "0x092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1",
+                    "stateRoot" : "0x9b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7a0076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114a0092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0d59aaafd5303e4089f15819866c61c6d91e838407d277dd93069325ae1dfedc188b43dab6f0711e49bf882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000013881ca0c10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506a073f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187c0",
+                "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" : "0xfa48997aef79ae22b6161ac9e2d35ec29d07b565da3b35bde014c8dc0f985290",
+        "network" : "Frontier",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f69fe0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7616020",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcall_00_OOGE_valueTransfer_d1g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_OOGE_valueTransfer_d1g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x029fe0",
+                    "hash" : "0xcb0d7542a90c33176dbc3c30635f5957d81d22814e60f47c9636df65526854d2",
+                    "mixHash" : "0xacf6598460a3fabb76ec997cb37b35fa90a91f6b6436f52ed64946eb9a0b1bb4",
+                    "nonce" : "0xe185571360545469",
+                    "number" : "0x01",
+                    "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
+                    "receiptTrie" : "0x092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1",
+                    "stateRoot" : "0x9b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7a0076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114a0092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0acf6598460a3fabb76ec997cb37b35fa90a91f6b6436f52ed64946eb9a0b1bb488e185571360545469f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000013881ca0c10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506a073f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187c0",
+                "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" : "0xcb0d7542a90c33176dbc3c30635f5957d81d22814e60f47c9636df65526854d2",
+        "network" : "Homestead",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f69fe0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7616020",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcall_00_OOGE_valueTransfer_d1g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xeb4efd5b5877e304df4d3a9e173396bb9719c621a0715d72cc41ce7e2495d353",
+                    "mixHash" : "0x6f69b873182e7a9fe90e455e082b7b21421766ab53ff676e25de898152767d8a",
+                    "nonce" : "0x5a3ef749766f3592",
+                    "number" : "0x01",
+                    "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
+                    "receiptTrie" : "0xda16c12e51914ab215b6da0ab16433ac8902f221b0f4802cc0b22164a5b6ce89",
+                    "stateRoot" : "0xb0644acf59ec5ef6db5598789df1fd21430169ab2309cbd6a354083f59217f95",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0644acf59ec5ef6db5598789df1fd21430169ab2309cbd6a354083f59217f95a0076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114a0da16c12e51914ab215b6da0ab16433ac8902f221b0f4802cc0b22164a5b6ce89b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083010b4f8203e880a06f69b873182e7a9fe90e455e082b7b21421766ab53ff676e25de898152767d8a885a3ef749766f3592f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000013881ca0c10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506a073f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187c0",
+                "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" : "0xeb4efd5b5877e304df4d3a9e173396bb9719c621a0715d72cc41ce7e2495d353",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "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",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd_d0g0v0.json
index 973c75bb7..d793222d3 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcall_00_SuicideEnd_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ed",
-                    "hash" : "a34522ed3e2e6137948f9a86516a28535c9b07ae0b86e5709162214036b2736b",
-                    "mixHash" : "fa7c5e6fc1eeec15eebef924452a2f5eceb6d8a9d2be2efd57ab35308bfc175e",
-                    "nonce" : "ab28e5ec16287c4a",
+                    "hash" : "0x60adbb1622c784c2354d709b857a3e8d0681de57e5931aca0363f8065fdb67d2",
+                    "mixHash" : "0x972bd34a12013ff2ebbc47a12e8ed12f8fba2e6629dfd1fee8da0f04857c0225",
+                    "nonce" : "0x4cd89d85db046832",
                     "number" : "0x01",
-                    "parentHash" : "391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
-                    "receiptTrie" : "117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892",
-                    "stateRoot" : "591d0d5e39176a8456e9694a7fd368315fc36f532628a0ac9738300e15952245",
+                    "parentHash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
+                    "receiptTrie" : "0x117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892",
+                    "stateRoot" : "0x591d0d5e39176a8456e9694a7fd368315fc36f532628a0ac9738300e15952245",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0591d0d5e39176a8456e9694a7fd368315fc36f532628a0ac9738300e15952245a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0fa7c5e6fc1eeec15eebef924452a2f5eceb6d8a9d2be2efd57ab35308bfc175e88ab28e5ec16287c4af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0591d0d5e39176a8456e9694a7fd368315fc36f532628a0ac9738300e15952245a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0972bd34a12013ff2ebbc47a12e8ed12f8fba2e6629dfd1fee8da0f04857c0225884cd89d85db046832f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "41d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x41d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a34522ed3e2e6137948f9a86516a28535c9b07ae0b86e5709162214036b2736b",
+        "lastblockhash" : "0x60adbb1622c784c2354d709b857a3e8d0681de57e5931aca0363f8065fdb67d2",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
@@ -76,46 +81,46 @@
                     "0x02" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f7ed",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7630813",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -123,36 +128,41 @@
         }
     },
     "callcall_00_SuicideEnd_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ed",
-                    "hash" : "99a9857b260cb8029ac5727c12540094f826b21c86d4224e43b4b52cd7fb638f",
-                    "mixHash" : "46c045893dedb2335d4c61f728fb0c5ea1f3d354d6303e37e3e7c79c2876e818",
-                    "nonce" : "a59ce2c4a910e69a",
+                    "hash" : "0x8ea2257cf825b92af86c4005257514529844608d99495796fa1c69ae1ea4e475",
+                    "mixHash" : "0xebb195376afc6400a16e760a00574a27b4820c4a871bf2e2a42ce31469f57d82",
+                    "nonce" : "0xe5865d04334df5e9",
                     "number" : "0x01",
-                    "parentHash" : "391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
-                    "receiptTrie" : "117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892",
-                    "stateRoot" : "591d0d5e39176a8456e9694a7fd368315fc36f532628a0ac9738300e15952245",
+                    "parentHash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
+                    "receiptTrie" : "0x117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892",
+                    "stateRoot" : "0x591d0d5e39176a8456e9694a7fd368315fc36f532628a0ac9738300e15952245",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0591d0d5e39176a8456e9694a7fd368315fc36f532628a0ac9738300e15952245a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a046c045893dedb2335d4c61f728fb0c5ea1f3d354d6303e37e3e7c79c2876e81888a59ce2c4a910e69af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0591d0d5e39176a8456e9694a7fd368315fc36f532628a0ac9738300e15952245a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0ebb195376afc6400a16e760a00574a27b4820c4a871bf2e2a42ce31469f57d8288e5865d04334df5e9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -162,28 +172,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "41d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x41d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "99a9857b260cb8029ac5727c12540094f826b21c86d4224e43b4b52cd7fb638f",
+        "lastblockhash" : "0x8ea2257cf825b92af86c4005257514529844608d99495796fa1c69ae1ea4e475",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -191,7 +201,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
@@ -199,46 +209,46 @@
                     "0x02" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f7ed",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7630813",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -246,36 +256,41 @@
         }
     },
     "callcall_00_SuicideEnd_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xdf3d",
-                    "hash" : "4d4475831f38a6edf1fc73321d91fa1f0b6971eb9eab59c157493199e79cb643",
-                    "mixHash" : "3b879738d6496988aaf63c574349c2e63a28a8853d635f29b7076d8664eafd7e",
-                    "nonce" : "5af1f7f38985fa96",
+                    "hash" : "0x87f4e8a1a41a19ae56df0f17a31f052a1d54abea850b1ec8d2a012fa1a88bd96",
+                    "mixHash" : "0x064e4fb57d16483b58fdcbc18b91a7cfbd7d945ac6c83f70c0360c64a07be3ec",
+                    "nonce" : "0x95871bf9a1482b84",
                     "number" : "0x01",
-                    "parentHash" : "391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
-                    "receiptTrie" : "be59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352",
-                    "stateRoot" : "d4c4d1dac9d144065b58906afd684273b19e05e6ca44b1884e1126e50ec0aac6",
+                    "parentHash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
+                    "receiptTrie" : "0xbe59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352",
+                    "stateRoot" : "0xd4c4d1dac9d144065b58906afd684273b19e05e6ca44b1884e1126e50ec0aac6",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d4c4d1dac9d144065b58906afd684273b19e05e6ca44b1884e1126e50ec0aac6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0be59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a03b879738d6496988aaf63c574349c2e63a28a8853d635f29b7076d8664eafd7e885af1f7f38985fa96f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d4c4d1dac9d144065b58906afd684273b19e05e6ca44b1884e1126e50ec0aac6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0be59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0064e4fb57d16483b58fdcbc18b91a7cfbd7d945ac6c83f70c0360c64a07be3ec8895871bf9a1482b84f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -285,28 +300,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "41d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x41d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4d4475831f38a6edf1fc73321d91fa1f0b6971eb9eab59c157493199e79cb643",
+        "lastblockhash" : "0x87f4e8a1a41a19ae56df0f17a31f052a1d54abea850b1ec8d2a012fa1a88bd96",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -314,7 +329,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
@@ -322,46 +337,46 @@
                     "0x02" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4df3d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a76320c3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -369,36 +384,41 @@
         }
     },
     "callcall_00_SuicideEnd_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xdf3d",
-                    "hash" : "47b18f32716bb66f6d4cf284a32a339ce6537b1d1671734e4a1d48c8dc913a9c",
-                    "mixHash" : "ba8e8e1943e11a0ddf18cc6b381909542d3e84fd32322529708233471ccfe6bc",
-                    "nonce" : "91b22e1ebf0925a4",
+                    "hash" : "0xb071c44151d4c00166e7f158ec1c44c59156ee85172ba15cb81cda5b48c3bc92",
+                    "mixHash" : "0x306b9b3d4dd1b04e1210f4a7e7363f125a2d07c2942dcb912c059479340d1466",
+                    "nonce" : "0x03b0e897807ad764",
                     "number" : "0x01",
-                    "parentHash" : "391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
-                    "receiptTrie" : "be59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352",
-                    "stateRoot" : "d4c4d1dac9d144065b58906afd684273b19e05e6ca44b1884e1126e50ec0aac6",
+                    "parentHash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
+                    "receiptTrie" : "0xbe59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352",
+                    "stateRoot" : "0xd4c4d1dac9d144065b58906afd684273b19e05e6ca44b1884e1126e50ec0aac6",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d4c4d1dac9d144065b58906afd684273b19e05e6ca44b1884e1126e50ec0aac6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0be59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0ba8e8e1943e11a0ddf18cc6b381909542d3e84fd32322529708233471ccfe6bc8891b22e1ebf0925a4f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d4c4d1dac9d144065b58906afd684273b19e05e6ca44b1884e1126e50ec0aac6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0be59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0306b9b3d4dd1b04e1210f4a7e7363f125a2d07c2942dcb912c059479340d14668803b0e897807ad764f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -408,28 +428,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "41d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x41d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "47b18f32716bb66f6d4cf284a32a339ce6537b1d1671734e4a1d48c8dc913a9c",
+        "lastblockhash" : "0xb071c44151d4c00166e7f158ec1c44c59156ee85172ba15cb81cda5b48c3bc92",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -437,7 +457,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
@@ -445,46 +465,181 @@
                     "0x02" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4df3d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a76320c3",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x33dc317e9e91d7b8bcce1e0728f6503f5717c7a8c3d530f0c6a54b73a03854a1",
+                    "mixHash" : "0xbce28bd0655238dbd7447314842e562ed6ea405f6c79c8ee36fc185ee86c8c2d",
+                    "nonce" : "0x540cfec846e47c70",
+                    "number" : "0x01",
+                    "parentHash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
+                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
+                    "stateRoot" : "0xc9c8d41dec8208f6955f5c0cb10b517ef0a35859d163799118788109623c499d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c9c8d41dec8208f6955f5c0cb10b517ef0a35859d163799118788109623c499da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0bce28bd0655238dbd7447314842e562ed6ea405f6c79c8ee36fc185ee86c8c2d88540cfec846e47c70f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x33dc317e9e91d7b8bcce1e0728f6503f5717c7a8c3d530f0c6a54b73a03854a1",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_d0g0v0.json
index c6222c732..8c0ecc96f 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcall_00_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03997d",
-                    "hash" : "d3d7858275b04f8276d7a6baae4cada8ad59332ca3fd60cd4fc3d4589c71748d",
-                    "mixHash" : "ad85ee1ba1e57b409c63528fe8d7d44843b1c33236c18c14a25939f16e506e5d",
-                    "nonce" : "30870eaacff205c3",
+                    "hash" : "0x474e48d11d18e96742b0d6d47c1a1aaf7b389ab7eac29c0f07e4254e5eefe8a9",
+                    "mixHash" : "0x3981b3e405049b922f3d82374a383c53ad902d8daa389ac739619c38d3b01dcb",
+                    "nonce" : "0x0cac8e38c7ef7041",
                     "number" : "0x01",
-                    "parentHash" : "ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
-                    "receiptTrie" : "448556ad917a03440b824b13928620feb7736dade89e1be8bc21e17b1797d6fa",
-                    "stateRoot" : "cae7faeb952aa089d9ea29d95ca485d4bd16397e1e7dedf0efd59274e8da32d0",
+                    "parentHash" : "0xff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
+                    "receiptTrie" : "0x448556ad917a03440b824b13928620feb7736dade89e1be8bc21e17b1797d6fa",
+                    "stateRoot" : "0xcae7faeb952aa089d9ea29d95ca485d4bd16397e1e7dedf0efd59274e8da32d0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cae7faeb952aa089d9ea29d95ca485d4bd16397e1e7dedf0efd59274e8da32d0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0448556ad917a03440b824b13928620feb7736dade89e1be8bc21e17b1797d6fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a0ad85ee1ba1e57b409c63528fe8d7d44843b1c33236c18c14a25939f16e506e5d8830870eaacff205c3f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cae7faeb952aa089d9ea29d95ca485d4bd16397e1e7dedf0efd59274e8da32d0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0448556ad917a03440b824b13928620feb7736dade89e1be8bc21e17b1797d6fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a03981b3e405049b922f3d82374a383c53ad902d8daa389ac739619c38d3b01dcb880cac8e38c7ef7041f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0ae2b0083edcbfa96299ea144cea5d0ff0682def972a6e81c67168b2845b43e9",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0ae2b0083edcbfa96299ea144cea5d0ff0682def972a6e81c67168b2845b43e9",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ae2b0083edcbfa96299ea144cea5d0ff0682def972a6e81c67168b2845b43e9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d3d7858275b04f8276d7a6baae4cada8ad59332ca3fd60cd4fc3d4589c71748d",
+        "lastblockhash" : "0x474e48d11d18e96742b0d6d47c1a1aaf7b389ab7eac29c0f07e4254e5eefe8a9",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
                 "nonce" : "0x00",
@@ -76,7 +81,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
@@ -91,46 +96,46 @@
                     "0xf0" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7997d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7606683",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -138,36 +143,41 @@
         }
     },
     "callcall_00_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03997d",
-                    "hash" : "ab27c88f6d78215c9b6765470fa4cc9208a639d9717329ff050d4f93230ccbf8",
-                    "mixHash" : "8e1315272f9136c68ecce0ee5fc28b44ff5b9aa5cd7249d72e1951c92f7af093",
-                    "nonce" : "ab907148f3612d5d",
+                    "hash" : "0xcedb49cb02cb3d9b978add53821aa07650a0446dc77448c3ef0e5488a01a9442",
+                    "mixHash" : "0x1aaf1dbb6a3f7ca204a08836ad0166906da71ac7cc6a2862fda37c9e99e0d1ec",
+                    "nonce" : "0x47beba4ebbb77510",
                     "number" : "0x01",
-                    "parentHash" : "ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
-                    "receiptTrie" : "448556ad917a03440b824b13928620feb7736dade89e1be8bc21e17b1797d6fa",
-                    "stateRoot" : "cae7faeb952aa089d9ea29d95ca485d4bd16397e1e7dedf0efd59274e8da32d0",
+                    "parentHash" : "0xff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
+                    "receiptTrie" : "0x448556ad917a03440b824b13928620feb7736dade89e1be8bc21e17b1797d6fa",
+                    "stateRoot" : "0xcae7faeb952aa089d9ea29d95ca485d4bd16397e1e7dedf0efd59274e8da32d0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cae7faeb952aa089d9ea29d95ca485d4bd16397e1e7dedf0efd59274e8da32d0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0448556ad917a03440b824b13928620feb7736dade89e1be8bc21e17b1797d6fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a08e1315272f9136c68ecce0ee5fc28b44ff5b9aa5cd7249d72e1951c92f7af09388ab907148f3612d5df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cae7faeb952aa089d9ea29d95ca485d4bd16397e1e7dedf0efd59274e8da32d0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0448556ad917a03440b824b13928620feb7736dade89e1be8bc21e17b1797d6fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a01aaf1dbb6a3f7ca204a08836ad0166906da71ac7cc6a2862fda37c9e99e0d1ec8847beba4ebbb77510f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -177,28 +187,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0ae2b0083edcbfa96299ea144cea5d0ff0682def972a6e81c67168b2845b43e9",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0ae2b0083edcbfa96299ea144cea5d0ff0682def972a6e81c67168b2845b43e9",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ae2b0083edcbfa96299ea144cea5d0ff0682def972a6e81c67168b2845b43e9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ab27c88f6d78215c9b6765470fa4cc9208a639d9717329ff050d4f93230ccbf8",
+        "lastblockhash" : "0xcedb49cb02cb3d9b978add53821aa07650a0446dc77448c3ef0e5488a01a9442",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -206,7 +216,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
                 "nonce" : "0x00",
@@ -214,7 +224,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
@@ -229,46 +239,46 @@
                     "0xf0" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7997d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7606683",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -276,36 +286,41 @@
         }
     },
     "callcall_00_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x039455",
-                    "hash" : "f8ee987944bd0687ef58815878cbe8a6633dcecd5d94340cb35250abb6ff5fda",
-                    "mixHash" : "87d37f19b7c086aa25c47ac3b61176b5c0482e46dadcc93a9a34db655a4db6d7",
-                    "nonce" : "8c4f09d92aef02f2",
+                    "hash" : "0x00d52c9904d44e3be3937c907f3e31f78bb4eb08db21a2dc5d00172d348b3256",
+                    "mixHash" : "0x57a91278bde126a6b2f6ab6d1ab392b97bf303bd472bd9281a7b55e56f81f08b",
+                    "nonce" : "0x49af7cbf3a32570f",
                     "number" : "0x01",
-                    "parentHash" : "ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
-                    "receiptTrie" : "9d295d3efbab4bb5622d77e8b90ab91d09a84f1fb256ef95f70a9a6406b7a38f",
-                    "stateRoot" : "7390e89e9a22ec45cf0aab5123baf889bbccc9833fc0262902ed7a41c4e8b742",
+                    "parentHash" : "0xff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
+                    "receiptTrie" : "0x9d295d3efbab4bb5622d77e8b90ab91d09a84f1fb256ef95f70a9a6406b7a38f",
+                    "stateRoot" : "0x7390e89e9a22ec45cf0aab5123baf889bbccc9833fc0262902ed7a41c4e8b742",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07390e89e9a22ec45cf0aab5123baf889bbccc9833fc0262902ed7a41c4e8b742a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09d295d3efbab4bb5622d77e8b90ab91d09a84f1fb256ef95f70a9a6406b7a38fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a087d37f19b7c086aa25c47ac3b61176b5c0482e46dadcc93a9a34db655a4db6d7888c4f09d92aef02f2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07390e89e9a22ec45cf0aab5123baf889bbccc9833fc0262902ed7a41c4e8b742a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09d295d3efbab4bb5622d77e8b90ab91d09a84f1fb256ef95f70a9a6406b7a38fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a057a91278bde126a6b2f6ab6d1ab392b97bf303bd472bd9281a7b55e56f81f08b8849af7cbf3a32570ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -315,28 +330,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0ae2b0083edcbfa96299ea144cea5d0ff0682def972a6e81c67168b2845b43e9",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0ae2b0083edcbfa96299ea144cea5d0ff0682def972a6e81c67168b2845b43e9",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ae2b0083edcbfa96299ea144cea5d0ff0682def972a6e81c67168b2845b43e9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f8ee987944bd0687ef58815878cbe8a6633dcecd5d94340cb35250abb6ff5fda",
+        "lastblockhash" : "0x00d52c9904d44e3be3937c907f3e31f78bb4eb08db21a2dc5d00172d348b3256",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -344,7 +359,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
                 "nonce" : "0x00",
@@ -352,7 +367,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
@@ -367,46 +382,46 @@
                     "0xf0" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f79455",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7606bab",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -414,36 +429,41 @@
         }
     },
     "callcall_00_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x039455",
-                    "hash" : "f40a7ee503b875bb0304846d85caecee9eaea169bdea1f0d5784dbfb97f7bc01",
-                    "mixHash" : "afd222ca00d9741202c14c88e5c4327c65862234b6fb6f8e81c25839d86582a1",
-                    "nonce" : "95f088f67c6a572a",
+                    "hash" : "0xf7e84e3fdbea42510cd17b115df85091d0bcb1bba3cd0255e8a5be448b56f784",
+                    "mixHash" : "0x350787f0ddbd6114ab837912e40206a924cf2c3368f67a2107b24918bec0e129",
+                    "nonce" : "0x0ba4b8c4a0ddce85",
                     "number" : "0x01",
-                    "parentHash" : "ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
-                    "receiptTrie" : "9d295d3efbab4bb5622d77e8b90ab91d09a84f1fb256ef95f70a9a6406b7a38f",
-                    "stateRoot" : "7390e89e9a22ec45cf0aab5123baf889bbccc9833fc0262902ed7a41c4e8b742",
+                    "parentHash" : "0xff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
+                    "receiptTrie" : "0x9d295d3efbab4bb5622d77e8b90ab91d09a84f1fb256ef95f70a9a6406b7a38f",
+                    "stateRoot" : "0x7390e89e9a22ec45cf0aab5123baf889bbccc9833fc0262902ed7a41c4e8b742",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07390e89e9a22ec45cf0aab5123baf889bbccc9833fc0262902ed7a41c4e8b742a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09d295d3efbab4bb5622d77e8b90ab91d09a84f1fb256ef95f70a9a6406b7a38fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a0afd222ca00d9741202c14c88e5c4327c65862234b6fb6f8e81c25839d86582a18895f088f67c6a572af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07390e89e9a22ec45cf0aab5123baf889bbccc9833fc0262902ed7a41c4e8b742a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09d295d3efbab4bb5622d77e8b90ab91d09a84f1fb256ef95f70a9a6406b7a38fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a0350787f0ddbd6114ab837912e40206a924cf2c3368f67a2107b24918bec0e129880ba4b8c4a0ddce85f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -453,28 +473,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0ae2b0083edcbfa96299ea144cea5d0ff0682def972a6e81c67168b2845b43e9",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0ae2b0083edcbfa96299ea144cea5d0ff0682def972a6e81c67168b2845b43e9",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ae2b0083edcbfa96299ea144cea5d0ff0682def972a6e81c67168b2845b43e9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f40a7ee503b875bb0304846d85caecee9eaea169bdea1f0d5784dbfb97f7bc01",
+        "lastblockhash" : "0xf7e84e3fdbea42510cd17b115df85091d0bcb1bba3cd0255e8a5be448b56f784",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -482,7 +502,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
                 "nonce" : "0x00",
@@ -490,7 +510,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
@@ -505,46 +525,196 @@
                     "0xf0" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f79455",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7606bab",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x03997d",
+                    "hash" : "0xca9ceeacd3b349e2e584f0ebb6cbc5a389dd4e0a3dd9ac7c7add333eae34702b",
+                    "mixHash" : "0x6973fa52fc9bc77f9d3eeec2fa708d3a8b809d74c36b03d065219c84213ea5cb",
+                    "nonce" : "0xc0dfa6cfa2e29683",
+                    "number" : "0x01",
+                    "parentHash" : "0xff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
+                    "receiptTrie" : "0x607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03beb",
+                    "stateRoot" : "0xc6012985c959938ab579e107957c11917eb7751125c64eeab9ce577625a966cd",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c6012985c959938ab579e107957c11917eb7751125c64eeab9ce577625a966cda05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03bebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a06973fa52fc9bc77f9d3eeec2fa708d3a8b809d74c36b03d065219c84213ea5cb88c0dfa6cfa2e29683f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xca9ceeacd3b349e2e584f0ebb6cbc5a389dd4e0a3dd9ac7c7add333eae34702b",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGE.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGE_d0g0v0.json
index 0e1b317cb..b03927c65 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGE.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcall_000_OOGE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "3aa4a5bec0ac836500cd599fbbe8eb3f75887996ab7ff063fca69943a87b36fe",
-                    "mixHash" : "5b3a2046209406bf3bf45a05e28d21daa40c254752d878bcde7be161f5cdce14",
-                    "nonce" : "63b948d673f9a37b",
+                    "hash" : "0xb59e87fb1116c1129b606d329b4eb3ed2810deae82b4416cc66dc1fe3d08e0f0",
+                    "mixHash" : "0x57bcc5f7554664c0a0c4b7e136658e825d0671cf8f3fc8693383639dc2dbd560",
+                    "nonce" : "0x6866a23016c58b1a",
                     "number" : "0x01",
-                    "parentHash" : "06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
-                    "receiptTrie" : "083496e0bdae56051e8e40353eb1c7b47a0a60cb05f0450ca3bbbd4054f156fa",
-                    "stateRoot" : "f833bdcc5932c719af97e86108a5ee220aecaee78dc760710437e2ce2efb6a4d",
+                    "parentHash" : "0x06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
+                    "receiptTrie" : "0x083496e0bdae56051e8e40353eb1c7b47a0a60cb05f0450ca3bbbd4054f156fa",
+                    "stateRoot" : "0xf833bdcc5932c719af97e86108a5ee220aecaee78dc760710437e2ce2efb6a4d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a006ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f833bdcc5932c719af97e86108a5ee220aecaee78dc760710437e2ce2efb6a4da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0083496e0bdae56051e8e40353eb1c7b47a0a60cb05f0450ca3bbbd4054f156fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a05b3a2046209406bf3bf45a05e28d21daa40c254752d878bcde7be161f5cdce148863b948d673f9a37bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a006ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f833bdcc5932c719af97e86108a5ee220aecaee78dc760710437e2ce2efb6a4da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0083496e0bdae56051e8e40353eb1c7b47a0a60cb05f0450ca3bbbd4054f156fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a057bcc5f7554664c0a0c4b7e136658e825d0671cf8f3fc8693383639dc2dbd560886866a23016c58b1af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8eeb8ad3fd9eded0131e47747dc558496c97fac21006fd50504e0434fe01762c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8eeb8ad3fd9eded0131e47747dc558496c97fac21006fd50504e0434fe01762c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08eeb8ad3fd9eded0131e47747dc558496c97fac21006fd50504e0434fe01762ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3aa4a5bec0ac836500cd599fbbe8eb3f75887996ab7ff063fca69943a87b36fe",
+        "lastblockhash" : "0xb59e87fb1116c1129b606d329b4eb3ed2810deae82b4416cc66dc1fe3d08e0f0",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -76,67 +81,67 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55892",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762a76e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -144,36 +149,41 @@
         }
     },
     "callcallcall_000_OOGE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "4f3b97d70aa2af6a61b31f52a9111e963a73170d11d384203984b5e404d8c6fb",
-                    "mixHash" : "dc148c7a56f4fbfa06e42e7b0511449418604370196e6325336ebb72d83d6cc2",
-                    "nonce" : "513bc7e900574e28",
+                    "hash" : "0xc5cb24db701027f21fdc1500d85790e41ba18f35b83800d6e282964af18426f1",
+                    "mixHash" : "0x8858b0653af7c4d066728ff0e63f3eea27bd6296cdbf25fa0489ab8a3016288e",
+                    "nonce" : "0xea3f06d0ad3abbd8",
                     "number" : "0x01",
-                    "parentHash" : "06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
-                    "receiptTrie" : "083496e0bdae56051e8e40353eb1c7b47a0a60cb05f0450ca3bbbd4054f156fa",
-                    "stateRoot" : "f833bdcc5932c719af97e86108a5ee220aecaee78dc760710437e2ce2efb6a4d",
+                    "parentHash" : "0x06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
+                    "receiptTrie" : "0x083496e0bdae56051e8e40353eb1c7b47a0a60cb05f0450ca3bbbd4054f156fa",
+                    "stateRoot" : "0xf833bdcc5932c719af97e86108a5ee220aecaee78dc760710437e2ce2efb6a4d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a006ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f833bdcc5932c719af97e86108a5ee220aecaee78dc760710437e2ce2efb6a4da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0083496e0bdae56051e8e40353eb1c7b47a0a60cb05f0450ca3bbbd4054f156fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0dc148c7a56f4fbfa06e42e7b0511449418604370196e6325336ebb72d83d6cc288513bc7e900574e28f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a006ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f833bdcc5932c719af97e86108a5ee220aecaee78dc760710437e2ce2efb6a4da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0083496e0bdae56051e8e40353eb1c7b47a0a60cb05f0450ca3bbbd4054f156fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a08858b0653af7c4d066728ff0e63f3eea27bd6296cdbf25fa0489ab8a3016288e88ea3f06d0ad3abbd8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -183,28 +193,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8eeb8ad3fd9eded0131e47747dc558496c97fac21006fd50504e0434fe01762c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8eeb8ad3fd9eded0131e47747dc558496c97fac21006fd50504e0434fe01762c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08eeb8ad3fd9eded0131e47747dc558496c97fac21006fd50504e0434fe01762ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4f3b97d70aa2af6a61b31f52a9111e963a73170d11d384203984b5e404d8c6fb",
+        "lastblockhash" : "0xc5cb24db701027f21fdc1500d85790e41ba18f35b83800d6e282964af18426f1",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -212,7 +222,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -220,67 +230,67 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55892",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762a76e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -288,36 +298,41 @@
         }
     },
     "callcallcall_000_OOGE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "6ea4c5554627ce574c44cdccab991fb1c8af9eeeed10099562ee2987699469b5",
-                    "mixHash" : "671c98329fe9dd05b612fc2e268679dec857363ff71bc0b4be8cf0a57968b676",
-                    "nonce" : "b9e2190eca215cc9",
+                    "hash" : "0xd66c7a42b29fa8429490bc492332dd257adb0feaa7d9782f8f531839db6b3f94",
+                    "mixHash" : "0x4f109939fcde4806669fa49f9f82b6a471aa8bbd2434af8c457bad6e9e7c08b4",
+                    "nonce" : "0x7a7adf93d336342d",
                     "number" : "0x01",
-                    "parentHash" : "06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
-                    "receiptTrie" : "0a4c11d92fe5491273aa5f1152d81cc93efee7493040d9d78d761b33c99c568b",
-                    "stateRoot" : "d61b524cf931cb3883e8d3975c0f59a6bfd8f85281cd15fbf501f9260a7bb637",
+                    "parentHash" : "0x06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
+                    "receiptTrie" : "0x0a4c11d92fe5491273aa5f1152d81cc93efee7493040d9d78d761b33c99c568b",
+                    "stateRoot" : "0xd61b524cf931cb3883e8d3975c0f59a6bfd8f85281cd15fbf501f9260a7bb637",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a006ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d61b524cf931cb3883e8d3975c0f59a6bfd8f85281cd15fbf501f9260a7bb637a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00a4c11d92fe5491273aa5f1152d81cc93efee7493040d9d78d761b33c99c568bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0671c98329fe9dd05b612fc2e268679dec857363ff71bc0b4be8cf0a57968b67688b9e2190eca215cc9f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a006ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d61b524cf931cb3883e8d3975c0f59a6bfd8f85281cd15fbf501f9260a7bb637a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00a4c11d92fe5491273aa5f1152d81cc93efee7493040d9d78d761b33c99c568bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a04f109939fcde4806669fa49f9f82b6a471aa8bbd2434af8c457bad6e9e7c08b4887a7adf93d336342df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -327,28 +342,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8eeb8ad3fd9eded0131e47747dc558496c97fac21006fd50504e0434fe01762c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8eeb8ad3fd9eded0131e47747dc558496c97fac21006fd50504e0434fe01762c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08eeb8ad3fd9eded0131e47747dc558496c97fac21006fd50504e0434fe01762ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "6ea4c5554627ce574c44cdccab991fb1c8af9eeeed10099562ee2987699469b5",
+        "lastblockhash" : "0xd66c7a42b29fa8429490bc492332dd257adb0feaa7d9782f8f531839db6b3f94",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -356,7 +371,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -364,67 +379,67 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550d6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af2a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -432,36 +447,41 @@
         }
     },
     "callcallcall_000_OOGE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "d9923c8fb782127d0b573d9169ede996f661d37719a304c1c035c124963c07e1",
-                    "mixHash" : "527ac87606598e9ece7e102b81bb6e27dc7a09248ca62cf07d69540b2007f001",
-                    "nonce" : "34107360075ddd08",
+                    "hash" : "0x94f064ca8d2be23c573496b0dbe139a855513bea3672a8953c269c0ba8e65e15",
+                    "mixHash" : "0x77589870c7e611bb79f1731ae2243478691a93ea99aeec10163820e33cc4759c",
+                    "nonce" : "0x1b97c725f5aa7f82",
                     "number" : "0x01",
-                    "parentHash" : "06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
-                    "receiptTrie" : "0a4c11d92fe5491273aa5f1152d81cc93efee7493040d9d78d761b33c99c568b",
-                    "stateRoot" : "d61b524cf931cb3883e8d3975c0f59a6bfd8f85281cd15fbf501f9260a7bb637",
+                    "parentHash" : "0x06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
+                    "receiptTrie" : "0x0a4c11d92fe5491273aa5f1152d81cc93efee7493040d9d78d761b33c99c568b",
+                    "stateRoot" : "0xd61b524cf931cb3883e8d3975c0f59a6bfd8f85281cd15fbf501f9260a7bb637",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a006ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d61b524cf931cb3883e8d3975c0f59a6bfd8f85281cd15fbf501f9260a7bb637a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00a4c11d92fe5491273aa5f1152d81cc93efee7493040d9d78d761b33c99c568bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0527ac87606598e9ece7e102b81bb6e27dc7a09248ca62cf07d69540b2007f0018834107360075ddd08f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a006ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d61b524cf931cb3883e8d3975c0f59a6bfd8f85281cd15fbf501f9260a7bb637a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00a4c11d92fe5491273aa5f1152d81cc93efee7493040d9d78d761b33c99c568bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a077589870c7e611bb79f1731ae2243478691a93ea99aeec10163820e33cc4759c881b97c725f5aa7f82f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -471,28 +491,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8eeb8ad3fd9eded0131e47747dc558496c97fac21006fd50504e0434fe01762c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8eeb8ad3fd9eded0131e47747dc558496c97fac21006fd50504e0434fe01762c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08eeb8ad3fd9eded0131e47747dc558496c97fac21006fd50504e0434fe01762ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d9923c8fb782127d0b573d9169ede996f661d37719a304c1c035c124963c07e1",
+        "lastblockhash" : "0x94f064ca8d2be23c573496b0dbe139a855513bea3672a8953c269c0ba8e65e15",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -500,7 +520,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -508,67 +528,223 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550d6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af2a",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x6db507e4fcaa1d9a8472310d3f8e54acc207b25881944943248007f1ae6cdc57",
+                    "mixHash" : "0xa551659887bce9602c119a68ac3eb5aecf1e77f8f9c764effac3122b3cd5a329",
+                    "nonce" : "0xfc8d78157cdfd41f",
+                    "number" : "0x01",
+                    "parentHash" : "0x06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0xfbd56facfe032c4b5bd1c58c4af4989779aa53d667ca85e0f31193056e995962",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a006ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbd56facfe032c4b5bd1c58c4af4989779aa53d667ca85e0f31193056e995962a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0a551659887bce9602c119a68ac3eb5aecf1e77f8f9c764effac3122b3cd5a32988fc8d78157cdfd41ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0x6db507e4fcaa1d9a8472310d3f8e54acc207b25881944943248007f1ae6cdc57",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter_d0g0v0.json
index f9605858a..58d10a3c4 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcall_000_OOGMAfter_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "530f2f4f44fd13acd241233624bb7fdeb5f68ff3f69fc8615ea9033ae8f96144",
-                    "mixHash" : "ffdeefafc4d5643494cd84377df0d0f2de7fa5e598cf7cb07808dc6f8a752309",
-                    "nonce" : "49a58bd226a64219",
+                    "hash" : "0x2abaddccd37fac30e09ddd5150a232b2af578f58176113e01c39b0b721bd518a",
+                    "mixHash" : "0x755c6bc30860a89b9dbb584e77cad478847574d46134ee1be0cd44a7f7fce847",
+                    "nonce" : "0x08c91ad9188c6973",
                     "number" : "0x01",
-                    "parentHash" : "6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
-                    "receiptTrie" : "e49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254",
-                    "stateRoot" : "e5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974",
+                    "parentHash" : "0x6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
+                    "receiptTrie" : "0xe49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254",
+                    "stateRoot" : "0xe5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0ffdeefafc4d5643494cd84377df0d0f2de7fa5e598cf7cb07808dc6f8a7523098849a58bd226a64219f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a06f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0755c6bc30860a89b9dbb584e77cad478847574d46134ee1be0cd44a7f7fce8478808c91ad9188c6973f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987aba",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987aba",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987abaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "530f2f4f44fd13acd241233624bb7fdeb5f68ff3f69fc8615ea9033ae8f96144",
+        "lastblockhash" : "0x2abaddccd37fac30e09ddd5150a232b2af578f58176113e01c39b0b721bd518a",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcallcall_000_OOGMAfter_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "92a22209227157aaa0d643600cad6940c9d5f1f9225d5fc6d1e8f4b4f3a5f0fa",
-                    "mixHash" : "1349bbab51b73181f973f1bce4a2740c1629949cd2ca8cc258e46bce8a830e80",
-                    "nonce" : "5820ac96a03c7058",
+                    "hash" : "0x23e96bbb41cba34cf2f33c060385442cc0eb79d65f484a3bbf38db10cf06801a",
+                    "mixHash" : "0x6b028261b6423745b1ef65d4c1060b2d6361e98bb494362247634fe2662d3af6",
+                    "nonce" : "0x0ed240f3260382a1",
                     "number" : "0x01",
-                    "parentHash" : "6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
-                    "receiptTrie" : "e49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254",
-                    "stateRoot" : "e5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974",
+                    "parentHash" : "0x6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
+                    "receiptTrie" : "0xe49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254",
+                    "stateRoot" : "0xe5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a01349bbab51b73181f973f1bce4a2740c1629949cd2ca8cc258e46bce8a830e80885820ac96a03c7058f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a06f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a06b028261b6423745b1ef65d4c1060b2d6361e98bb494362247634fe2662d3af6880ed240f3260382a1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987aba",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987aba",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987abaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "92a22209227157aaa0d643600cad6940c9d5f1f9225d5fc6d1e8f4b4f3a5f0fa",
+        "lastblockhash" : "0x23e96bbb41cba34cf2f33c060385442cc0eb79d65f484a3bbf38db10cf06801a",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcallcall_000_OOGMAfter_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "103adb56f64c56cec7770f159602fd78a68d22f1e8fb2b1e9f1b7a9c5499657c",
-                    "mixHash" : "e5037b011e2668c0b760fd9d2e03bd0c7838f4e2d01804f29406a2b276af70ae",
-                    "nonce" : "2ac836f54a3a27c1",
+                    "hash" : "0x799bf46685acefe46d5ada59aa63f74798c658206620ebde124c9f6048b4b7a5",
+                    "mixHash" : "0xc69fcbe402ba9b93a7daa7b07ee4c9d64697ee1e992ce513dbfd836cb7cf61a4",
+                    "nonce" : "0xf520e83fc72e12ad",
                     "number" : "0x01",
-                    "parentHash" : "6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
-                    "receiptTrie" : "0b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62",
-                    "stateRoot" : "44b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006b",
+                    "parentHash" : "0x6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
+                    "receiptTrie" : "0x0b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62",
+                    "stateRoot" : "0x44b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006b",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0e5037b011e2668c0b760fd9d2e03bd0c7838f4e2d01804f29406a2b276af70ae882ac836f54a3a27c1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a06f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0c69fcbe402ba9b93a7daa7b07ee4c9d64697ee1e992ce513dbfd836cb7cf61a488f520e83fc72e12adf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987aba",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987aba",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987abaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "103adb56f64c56cec7770f159602fd78a68d22f1e8fb2b1e9f1b7a9c5499657c",
+        "lastblockhash" : "0x799bf46685acefe46d5ada59aa63f74798c658206620ebde124c9f6048b4b7a5",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcallcall_000_OOGMAfter_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "d20bdf8df0e2e69bb5a9765f9936ec800507e3b05b139ee583bc99d28275bb6b",
-                    "mixHash" : "245c1bcac755411e4d0a2d29f370615ff5bf4d9babbf26343243b8236b60211b",
-                    "nonce" : "a4cf9fb4abcb09e2",
+                    "hash" : "0x7326985a6354ce3ca2da75a17b7187e3472f50f8c6f8bd8c6a2a5b3b2a0ecdcf",
+                    "mixHash" : "0x87c9e0be21fb5f6a220c561fd11810572e68cffacb64d3e721db4c250ad934b0",
+                    "nonce" : "0xf5ec5529bec9d518",
                     "number" : "0x01",
-                    "parentHash" : "6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
-                    "receiptTrie" : "0b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62",
-                    "stateRoot" : "44b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006b",
+                    "parentHash" : "0x6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
+                    "receiptTrie" : "0x0b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62",
+                    "stateRoot" : "0x44b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006b",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0245c1bcac755411e4d0a2d29f370615ff5bf4d9babbf26343243b8236b60211b88a4cf9fb4abcb09e2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a06f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a087c9e0be21fb5f6a220c561fd11810572e68cffacb64d3e721db4c250ad934b088f5ec5529bec9d518f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987aba",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987aba",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987abaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d20bdf8df0e2e69bb5a9765f9936ec800507e3b05b139ee583bc99d28275bb6b",
+        "lastblockhash" : "0x7326985a6354ce3ca2da75a17b7187e3472f50f8c6f8bd8c6a2a5b3b2a0ecdcf",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x50207682b8367e6ae70850d4f15b1b1409fa3ec0b9f76b280fd2986d90f50133",
+                    "mixHash" : "0x1be9acddb08b153cb07b47174cb39c74380334e150eead6020f49e685db50372",
+                    "nonce" : "0x167194b3d3d82fea",
+                    "number" : "0x01",
+                    "parentHash" : "0x6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0xe071b9b09ca723711959b59fa6be0b437d14b5f146596d54bb4dcba20988f6e1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a06f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e071b9b09ca723711959b59fa6be0b437d14b5f146596d54bb4dcba20988f6e1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a01be9acddb08b153cb07b47174cb39c74380334e150eead6020f49e685db5037288167194b3d3d82feaf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0x50207682b8367e6ae70850d4f15b1b1409fa3ec0b9f76b280fd2986d90f50133",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore_d0g0v0.json
index df74c79b5..558510db5 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcall_000_OOGMBefore_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "bf0ff46fd8cc9ef31facb45f348ae11c752333efb88ed5c17865bf7a75607ef0",
-                    "mixHash" : "2fafa49262b107afdd9cf42d2f91db76f66ea20aa18fc5a9d70d1fcba05cd9f4",
-                    "nonce" : "aeefeecfddbb12ea",
+                    "hash" : "0xc26824e6ab8a3b0f720f9658e4eed6e3b7e12e345288e8c4e5d3656393dcad92",
+                    "mixHash" : "0x86eccbd5eef0e78ee4a6ffbe3a1ca96bbe72fce30fa10c2b8e91d0f42d6f82a1",
+                    "nonce" : "0xad822ab3dde62de6",
                     "number" : "0x01",
-                    "parentHash" : "6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
-                    "receiptTrie" : "f926f641b02d1f807e3ec0a62ea1ea1c78b0f9e08b7872519a0c7a70a731be76",
-                    "stateRoot" : "dba4d2948e42c04f2087e58d3c71d611b9c67e7eae51a00b21792b3a7c703f3d",
+                    "parentHash" : "0x6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
+                    "receiptTrie" : "0xf926f641b02d1f807e3ec0a62ea1ea1c78b0f9e08b7872519a0c7a70a731be76",
+                    "stateRoot" : "0xdba4d2948e42c04f2087e58d3c71d611b9c67e7eae51a00b21792b3a7c703f3d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dba4d2948e42c04f2087e58d3c71d611b9c67e7eae51a00b21792b3a7c703f3da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f926f641b02d1f807e3ec0a62ea1ea1c78b0f9e08b7872519a0c7a70a731be76b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a02fafa49262b107afdd9cf42d2f91db76f66ea20aa18fc5a9d70d1fcba05cd9f488aeefeecfddbb12eaf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a06de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dba4d2948e42c04f2087e58d3c71d611b9c67e7eae51a00b21792b3a7c703f3da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f926f641b02d1f807e3ec0a62ea1ea1c78b0f9e08b7872519a0c7a70a731be76b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a086eccbd5eef0e78ee4a6ffbe3a1ca96bbe72fce30fa10c2b8e91d0f42d6f82a188ad822ab3dde62de6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6613be7d3fa8f72d60927ee80a4e54dc6b50436bbfe3884f2641ea1af30d6766",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6613be7d3fa8f72d60927ee80a4e54dc6b50436bbfe3884f2641ea1af30d6766",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06613be7d3fa8f72d60927ee80a4e54dc6b50436bbfe3884f2641ea1af30d6766a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "bf0ff46fd8cc9ef31facb45f348ae11c752333efb88ed5c17865bf7a75607ef0",
+        "lastblockhash" : "0xc26824e6ab8a3b0f720f9658e4eed6e3b7e12e345288e8c4e5d3656393dcad92",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa0c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcallcall_000_OOGMBefore_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "51da2b07d2284607ac30d6f22d3f431522cea12fa1e8f97aa41a6ce6a554368a",
-                    "mixHash" : "1b35f9fa7c68a1e6615b09357a9ddebacfebef240e9b6ab9a565b2c7815538b4",
-                    "nonce" : "f2bf234cd9ffb1e2",
+                    "hash" : "0x760c05893a42a43c7ac4d117a006e5871e508f195792100d26b8d87239ae97d0",
+                    "mixHash" : "0xa3a0e4b1592cb8bc524cb2b5d3446da3a99219a7741366fe02f4bdaaac15a49b",
+                    "nonce" : "0x49a46590192797b3",
                     "number" : "0x01",
-                    "parentHash" : "6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
-                    "receiptTrie" : "f926f641b02d1f807e3ec0a62ea1ea1c78b0f9e08b7872519a0c7a70a731be76",
-                    "stateRoot" : "dba4d2948e42c04f2087e58d3c71d611b9c67e7eae51a00b21792b3a7c703f3d",
+                    "parentHash" : "0x6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
+                    "receiptTrie" : "0xf926f641b02d1f807e3ec0a62ea1ea1c78b0f9e08b7872519a0c7a70a731be76",
+                    "stateRoot" : "0xdba4d2948e42c04f2087e58d3c71d611b9c67e7eae51a00b21792b3a7c703f3d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dba4d2948e42c04f2087e58d3c71d611b9c67e7eae51a00b21792b3a7c703f3da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f926f641b02d1f807e3ec0a62ea1ea1c78b0f9e08b7872519a0c7a70a731be76b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a01b35f9fa7c68a1e6615b09357a9ddebacfebef240e9b6ab9a565b2c7815538b488f2bf234cd9ffb1e2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a06de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dba4d2948e42c04f2087e58d3c71d611b9c67e7eae51a00b21792b3a7c703f3da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f926f641b02d1f807e3ec0a62ea1ea1c78b0f9e08b7872519a0c7a70a731be76b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0a3a0e4b1592cb8bc524cb2b5d3446da3a99219a7741366fe02f4bdaaac15a49b8849a46590192797b3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6613be7d3fa8f72d60927ee80a4e54dc6b50436bbfe3884f2641ea1af30d6766",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6613be7d3fa8f72d60927ee80a4e54dc6b50436bbfe3884f2641ea1af30d6766",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06613be7d3fa8f72d60927ee80a4e54dc6b50436bbfe3884f2641ea1af30d6766a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "51da2b07d2284607ac30d6f22d3f431522cea12fa1e8f97aa41a6ce6a554368a",
+        "lastblockhash" : "0x760c05893a42a43c7ac4d117a006e5871e508f195792100d26b8d87239ae97d0",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa0c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcallcall_000_OOGMBefore_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "764f01f3e3e30bfffbe8b4be60813e798a9fb31be47489cc070fbb985245eb82",
-                    "mixHash" : "68ce2859dcf6c9f90b67c92ba9737995a54af7dc47947f1e8c0048288edb2c9b",
-                    "nonce" : "19bb532fe3a0066e",
+                    "hash" : "0x87bfa2169683e8584415dbe1e82ed0c4229968de35dd444c62060de4b6dd5f26",
+                    "mixHash" : "0x8db68b35517d2e5f540df61c99aac8fcd9952096e1fcfe15794b251b9c36c916",
+                    "nonce" : "0x5bd5e98de5ba68b2",
                     "number" : "0x01",
-                    "parentHash" : "6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
-                    "receiptTrie" : "f77ac55a5e04f3dc93c44d3e01b067374b1d2de4c4826c3c8e77aa8a70ae5333",
-                    "stateRoot" : "6eecfeed32b2e89f634a3e050fc4bfc77042295f2204fd409c8f2889e6026581",
+                    "parentHash" : "0x6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
+                    "receiptTrie" : "0xf77ac55a5e04f3dc93c44d3e01b067374b1d2de4c4826c3c8e77aa8a70ae5333",
+                    "stateRoot" : "0x6eecfeed32b2e89f634a3e050fc4bfc77042295f2204fd409c8f2889e6026581",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06eecfeed32b2e89f634a3e050fc4bfc77042295f2204fd409c8f2889e6026581a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f77ac55a5e04f3dc93c44d3e01b067374b1d2de4c4826c3c8e77aa8a70ae5333b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a068ce2859dcf6c9f90b67c92ba9737995a54af7dc47947f1e8c0048288edb2c9b8819bb532fe3a0066ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a06de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06eecfeed32b2e89f634a3e050fc4bfc77042295f2204fd409c8f2889e6026581a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f77ac55a5e04f3dc93c44d3e01b067374b1d2de4c4826c3c8e77aa8a70ae5333b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a08db68b35517d2e5f540df61c99aac8fcd9952096e1fcfe15794b251b9c36c916885bd5e98de5ba68b2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,28 +340,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6613be7d3fa8f72d60927ee80a4e54dc6b50436bbfe3884f2641ea1af30d6766",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6613be7d3fa8f72d60927ee80a4e54dc6b50436bbfe3884f2641ea1af30d6766",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06613be7d3fa8f72d60927ee80a4e54dc6b50436bbfe3884f2641ea1af30d6766a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "764f01f3e3e30bfffbe8b4be60813e798a9fb31be47489cc070fbb985245eb82",
+        "lastblockhash" : "0x87bfa2169683e8584415dbe1e82ed0c4229968de35dd444c62060de4b6dd5f26",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -354,74 +369,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -429,36 +444,41 @@
         }
     },
     "callcallcall_000_OOGMBefore_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "5dee75a0e4355168c415840c1ff7d6c46e404c846ef686db475dfa078cb3e915",
-                    "mixHash" : "b564aec2d80f1648dc282ffdebaa6900f3e7a99d7812ed6bd9083ec1bcbf37ac",
-                    "nonce" : "bb6c1bb9240bee56",
+                    "hash" : "0x204a36b4b59d84abf90f9e1f4d5f2fdbaa893ab0041e1bbf31065927b4e1f5ee",
+                    "mixHash" : "0x0c6c5eec8cbbca76e8edb469476adacc25fca188a86d55c4ea03d7508c9992e4",
+                    "nonce" : "0xd736437845e430a8",
                     "number" : "0x01",
-                    "parentHash" : "6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
-                    "receiptTrie" : "f77ac55a5e04f3dc93c44d3e01b067374b1d2de4c4826c3c8e77aa8a70ae5333",
-                    "stateRoot" : "6eecfeed32b2e89f634a3e050fc4bfc77042295f2204fd409c8f2889e6026581",
+                    "parentHash" : "0x6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
+                    "receiptTrie" : "0xf77ac55a5e04f3dc93c44d3e01b067374b1d2de4c4826c3c8e77aa8a70ae5333",
+                    "stateRoot" : "0x6eecfeed32b2e89f634a3e050fc4bfc77042295f2204fd409c8f2889e6026581",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06eecfeed32b2e89f634a3e050fc4bfc77042295f2204fd409c8f2889e6026581a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f77ac55a5e04f3dc93c44d3e01b067374b1d2de4c4826c3c8e77aa8a70ae5333b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0b564aec2d80f1648dc282ffdebaa6900f3e7a99d7812ed6bd9083ec1bcbf37ac88bb6c1bb9240bee56f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a06de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06eecfeed32b2e89f634a3e050fc4bfc77042295f2204fd409c8f2889e6026581a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f77ac55a5e04f3dc93c44d3e01b067374b1d2de4c4826c3c8e77aa8a70ae5333b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a00c6c5eec8cbbca76e8edb469476adacc25fca188a86d55c4ea03d7508c9992e488d736437845e430a8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -468,28 +488,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6613be7d3fa8f72d60927ee80a4e54dc6b50436bbfe3884f2641ea1af30d6766",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6613be7d3fa8f72d60927ee80a4e54dc6b50436bbfe3884f2641ea1af30d6766",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06613be7d3fa8f72d60927ee80a4e54dc6b50436bbfe3884f2641ea1af30d6766a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "5dee75a0e4355168c415840c1ff7d6c46e404c846ef686db475dfa078cb3e915",
+        "lastblockhash" : "0x204a36b4b59d84abf90f9e1f4d5f2fdbaa893ab0041e1bbf31065927b4e1f5ee",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -497,74 +517,229 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xaade1d05c585ca5156a8ee8d5cbd9ce1992275280f4c11892dab9aac2cb05fab",
+                    "mixHash" : "0xf307cdcdc074de62fa4a18c1dd3157b9526d04cb7b471ffb1060b8e9723e6fe3",
+                    "nonce" : "0x52f665f27e215167",
+                    "number" : "0x01",
+                    "parentHash" : "0x6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0x9e33a185f5ce6114948a0ceb49c046c2e2d7bece85d69501af45af9403bcfbfb",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a06de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09e33a185f5ce6114948a0ceb49c046c2e2d7bece85d69501af45af9403bcfbfba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0f307cdcdc074de62fa4a18c1dd3157b9526d04cb7b471ffb1060b8e9723e6fe38852f665f27e215167f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0xaade1d05c585ca5156a8ee8d5cbd9ce1992275280f4c11892dab9aac2cb05fab",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd_d0g0v0.json
index 879ed85be..1a4175418 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcall_000_SuicideEnd_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "8640ea6e06ad5a5499937331c55ebfa022a3c67228d0403cc33860f6266e9292",
-                    "mixHash" : "55c675ee1140f1ac404e107f1dd8b1b50b2b224e7a8d99c30aeb6d4e6c68f01d",
-                    "nonce" : "488078d61236faa9",
+                    "hash" : "0x119fa364a669e8ea32d1a24bb2753e44195e37ab7ad15b1da7cb1b36df31b3c8",
+                    "mixHash" : "0x8ad698af1d692da461bc3cf7c8430e373e96a73ae5b8866bd09cdc7112dcfd2d",
+                    "nonce" : "0xb15d0080bd36fc0b",
                     "number" : "0x01",
-                    "parentHash" : "93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
-                    "receiptTrie" : "cd52bac8a9fc858b68eec1336bd32112885c98528d0252a77ca91f780ffc5680",
-                    "stateRoot" : "1134a99c62efda8c96332bfca9fafea604eae83eb23198df011b88273d8fd243",
+                    "parentHash" : "0x93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
+                    "receiptTrie" : "0xcd52bac8a9fc858b68eec1336bd32112885c98528d0252a77ca91f780ffc5680",
+                    "stateRoot" : "0x1134a99c62efda8c96332bfca9fafea604eae83eb23198df011b88273d8fd243",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a093ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01134a99c62efda8c96332bfca9fafea604eae83eb23198df011b88273d8fd243a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0cd52bac8a9fc858b68eec1336bd32112885c98528d0252a77ca91f780ffc5680b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a055c675ee1140f1ac404e107f1dd8b1b50b2b224e7a8d99c30aeb6d4e6c68f01d88488078d61236faa9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a093ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01134a99c62efda8c96332bfca9fafea604eae83eb23198df011b88273d8fd243a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0cd52bac8a9fc858b68eec1336bd32112885c98528d0252a77ca91f780ffc5680b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a08ad698af1d692da461bc3cf7c8430e373e96a73ae5b8866bd09cdc7112dcfd2d88b15d0080bd36fc0bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "bd67e97a692bc425c06dc46052608c66cf514da358bb560d37573da9568f1b87",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbd67e97a692bc425c06dc46052608c66cf514da358bb560d37573da9568f1b87",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd67e97a692bc425c06dc46052608c66cf514da358bb560d37573da9568f1b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8640ea6e06ad5a5499937331c55ebfa022a3c67228d0403cc33860f6266e9292",
+        "lastblockhash" : "0x119fa364a669e8ea32d1a24bb2753e44195e37ab7ad15b1da7cb1b36df31b3c8",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x04a817c800",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -76,7 +81,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
@@ -84,53 +89,53 @@
                     "0x03" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f548e7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762b719",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -138,36 +143,41 @@
         }
     },
     "callcallcall_000_SuicideEnd_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "9d14f0f45422ab585996c69258aa33fedf78f0e3449563f39e443a467466dee5",
-                    "mixHash" : "0e175236d8f09e43b7be34095e027d426ac348103176b51522e2ec310b2d1dbf",
-                    "nonce" : "196fee3c0e225c43",
+                    "hash" : "0xff6ba0a7c899c909e4c9094085e883e92dd47c5d2061d3a345fa048db9573bef",
+                    "mixHash" : "0x885cc505c54121d9311d8141de3d34af5d9c08ccf3cfaae512a85325d1bb8c91",
+                    "nonce" : "0x78aff911afbea4a4",
                     "number" : "0x01",
-                    "parentHash" : "93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
-                    "receiptTrie" : "cd52bac8a9fc858b68eec1336bd32112885c98528d0252a77ca91f780ffc5680",
-                    "stateRoot" : "1134a99c62efda8c96332bfca9fafea604eae83eb23198df011b88273d8fd243",
+                    "parentHash" : "0x93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
+                    "receiptTrie" : "0xcd52bac8a9fc858b68eec1336bd32112885c98528d0252a77ca91f780ffc5680",
+                    "stateRoot" : "0x1134a99c62efda8c96332bfca9fafea604eae83eb23198df011b88273d8fd243",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a093ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01134a99c62efda8c96332bfca9fafea604eae83eb23198df011b88273d8fd243a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0cd52bac8a9fc858b68eec1336bd32112885c98528d0252a77ca91f780ffc5680b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a00e175236d8f09e43b7be34095e027d426ac348103176b51522e2ec310b2d1dbf88196fee3c0e225c43f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a093ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01134a99c62efda8c96332bfca9fafea604eae83eb23198df011b88273d8fd243a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0cd52bac8a9fc858b68eec1336bd32112885c98528d0252a77ca91f780ffc5680b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0885cc505c54121d9311d8141de3d34af5d9c08ccf3cfaae512a85325d1bb8c918878aff911afbea4a4f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -177,28 +187,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "bd67e97a692bc425c06dc46052608c66cf514da358bb560d37573da9568f1b87",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbd67e97a692bc425c06dc46052608c66cf514da358bb560d37573da9568f1b87",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd67e97a692bc425c06dc46052608c66cf514da358bb560d37573da9568f1b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9d14f0f45422ab585996c69258aa33fedf78f0e3449563f39e443a467466dee5",
+        "lastblockhash" : "0xff6ba0a7c899c909e4c9094085e883e92dd47c5d2061d3a345fa048db9573bef",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -206,7 +216,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x04a817c800",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -214,7 +224,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
@@ -222,53 +232,53 @@
                     "0x03" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f548e7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762b719",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -276,36 +286,41 @@
         }
     },
     "callcallcall_000_SuicideEnd_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "808495a0233d759198ad68451327cd7c5aa8f62897c9a4747ac60078505cbf4b",
-                    "mixHash" : "c27ca51bf1bce37c2e5313c82aac263a8f54140d855e8d7d73f06d6097634180",
-                    "nonce" : "eddbc9f011d605bf",
+                    "hash" : "0x90c646a480d0235d6a9b844971687ff29c0738e03f3548d1720254ae54ec7f6b",
+                    "mixHash" : "0xaa072951d817116b947e10c1b690cc08d25a4cddaca514a047d154c901c36df0",
+                    "nonce" : "0x8fd8e42e5843061e",
                     "number" : "0x01",
-                    "parentHash" : "93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
-                    "receiptTrie" : "eaa27ca43d14ac3649aae67143dcdec93fcae0bc0221d99ca917940f6f1edfb4",
-                    "stateRoot" : "2c6c58194b07a322e877ec4c1564f74564026a37cf50eaeb129f651593ec0b33",
+                    "parentHash" : "0x93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
+                    "receiptTrie" : "0xeaa27ca43d14ac3649aae67143dcdec93fcae0bc0221d99ca917940f6f1edfb4",
+                    "stateRoot" : "0x2c6c58194b07a322e877ec4c1564f74564026a37cf50eaeb129f651593ec0b33",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a093ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c6c58194b07a322e877ec4c1564f74564026a37cf50eaeb129f651593ec0b33a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eaa27ca43d14ac3649aae67143dcdec93fcae0bc0221d99ca917940f6f1edfb4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0c27ca51bf1bce37c2e5313c82aac263a8f54140d855e8d7d73f06d609763418088eddbc9f011d605bff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a093ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c6c58194b07a322e877ec4c1564f74564026a37cf50eaeb129f651593ec0b33a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eaa27ca43d14ac3649aae67143dcdec93fcae0bc0221d99ca917940f6f1edfb4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0aa072951d817116b947e10c1b690cc08d25a4cddaca514a047d154c901c36df0888fd8e42e5843061ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -315,28 +330,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "bd67e97a692bc425c06dc46052608c66cf514da358bb560d37573da9568f1b87",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbd67e97a692bc425c06dc46052608c66cf514da358bb560d37573da9568f1b87",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd67e97a692bc425c06dc46052608c66cf514da358bb560d37573da9568f1b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "808495a0233d759198ad68451327cd7c5aa8f62897c9a4747ac60078505cbf4b",
+        "lastblockhash" : "0x90c646a480d0235d6a9b844971687ff29c0738e03f3548d1720254ae54ec7f6b",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -344,7 +359,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x04a817c800",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -352,7 +367,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
@@ -360,53 +375,53 @@
                     "0x03" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52da3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762d25d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -414,36 +429,41 @@
         }
     },
     "callcallcall_000_SuicideEnd_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "320ae9a347310b26c8eb582726bf1a285e9f16670f54f82e2f37a514feabc901",
-                    "mixHash" : "424fb3b081603e8933d5b7964134bc544337fc6ab9666ec33159d8338c672cce",
-                    "nonce" : "d09c6d84048c87f7",
+                    "hash" : "0x1952fdd4778781b3569bf5dc96e882b29a490542aff1af493068503e0d92f18b",
+                    "mixHash" : "0x3ea8ac580f894dff34b2d61fc6cf81ec04622f89c0694f786f8c0784f2b89beb",
+                    "nonce" : "0x9632b14868d72445",
                     "number" : "0x01",
-                    "parentHash" : "93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
-                    "receiptTrie" : "eaa27ca43d14ac3649aae67143dcdec93fcae0bc0221d99ca917940f6f1edfb4",
-                    "stateRoot" : "2c6c58194b07a322e877ec4c1564f74564026a37cf50eaeb129f651593ec0b33",
+                    "parentHash" : "0x93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
+                    "receiptTrie" : "0xeaa27ca43d14ac3649aae67143dcdec93fcae0bc0221d99ca917940f6f1edfb4",
+                    "stateRoot" : "0x2c6c58194b07a322e877ec4c1564f74564026a37cf50eaeb129f651593ec0b33",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a093ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c6c58194b07a322e877ec4c1564f74564026a37cf50eaeb129f651593ec0b33a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eaa27ca43d14ac3649aae67143dcdec93fcae0bc0221d99ca917940f6f1edfb4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0424fb3b081603e8933d5b7964134bc544337fc6ab9666ec33159d8338c672cce88d09c6d84048c87f7f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a093ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c6c58194b07a322e877ec4c1564f74564026a37cf50eaeb129f651593ec0b33a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eaa27ca43d14ac3649aae67143dcdec93fcae0bc0221d99ca917940f6f1edfb4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a03ea8ac580f894dff34b2d61fc6cf81ec04622f89c0694f786f8c0784f2b89beb889632b14868d72445f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -453,28 +473,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "bd67e97a692bc425c06dc46052608c66cf514da358bb560d37573da9568f1b87",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbd67e97a692bc425c06dc46052608c66cf514da358bb560d37573da9568f1b87",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd67e97a692bc425c06dc46052608c66cf514da358bb560d37573da9568f1b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "320ae9a347310b26c8eb582726bf1a285e9f16670f54f82e2f37a514feabc901",
+        "lastblockhash" : "0x1952fdd4778781b3569bf5dc96e882b29a490542aff1af493068503e0d92f18b",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -482,7 +502,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x04a817c800",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -490,7 +510,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
@@ -498,53 +518,203 @@
                     "0x03" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52da3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762d25d",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x34341b355378b5a27cf2794a7d0e8cc5fe6f6cba92665012e49faa13e27486cb",
+                    "mixHash" : "0x24e781d30dc6fce59e4410053a108732247eba794cbd8d02d3a1703e2a892d12",
+                    "nonce" : "0xbdaab6418d6dfba8",
+                    "number" : "0x01",
+                    "parentHash" : "0x93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0x9321b361854dfe165013203fe641b4aeb8553d01790b2e7e0184cf228fabbd47",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a093ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09321b361854dfe165013203fe641b4aeb8553d01790b2e7e0184cf228fabbd47a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a024e781d30dc6fce59e4410053a108732247eba794cbd8d02d3a1703e2a892d1288bdaab6418d6dfba8f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x34341b355378b5a27cf2794a7d0e8cc5fe6f6cba92665012e49faa13e27486cb",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle_d0g0v0.json
index 9ac7671f4..1f72401a1 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcall_000_SuicideMiddle_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_SuicideMiddle_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "da30ba06f2c165819e3fac800484af3308935fd5e136c890baa8bc4d7cb03109",
-                    "mixHash" : "311592d7a8733e2b09e8ef73c7bbb4c0283b802b951e4f7fb1fc06abd8bd9d71",
-                    "nonce" : "2a26a5768ab91e25",
+                    "hash" : "0x4b549d21b4d37fe023a6e14b2cc4939d4dbd11a01679fbf27fdd3b079f54782e",
+                    "mixHash" : "0x397f8396499b6a569d221518a866c2b6e8768b46bace290953e018d91d05df8c",
+                    "nonce" : "0x6ce4ed4ae38336b5",
                     "number" : "0x01",
-                    "parentHash" : "2b98ed30defda36d7fb96883ca23d5fdf13fa6d5536e97cb01bdd4a77207ff22",
-                    "receiptTrie" : "f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1",
-                    "stateRoot" : "ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07",
+                    "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+                    "receiptTrie" : "0xf5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1",
+                    "stateRoot" : "0xef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a02b98ed30defda36d7fb96883ca23d5fdf13fa6d5536e97cb01bdd4a77207ff22a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0311592d7a8733e2b09e8ef73c7bbb4c0283b802b951e4f7fb1fc06abd8bd9d71882a26a5768ab91e25f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0397f8396499b6a569d221518a866c2b6e8768b46bace290953e018d91d05df8c886ce4ed4ae38336b5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "2b98ed30defda36d7fb96883ca23d5fdf13fa6d5536e97cb01bdd4a77207ff22",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1f8abb90caf4cb325711422e874cecdf4c4ae077978c9a0ccb95ad6fc9d3ab21",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f8abb90caf4cb325711422e874cecdf4c4ae077978c9a0ccb95ad6fc9d3ab21a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "da30ba06f2c165819e3fac800484af3308935fd5e136c890baa8bc4d7cb03109",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4b549d21b4d37fe023a6e14b2cc4939d4dbd11a01679fbf27fdd3b079f54782e",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -76,60 +81,60 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4a9c7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7635639",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -137,36 +142,41 @@
         }
     },
     "callcallcall_000_SuicideMiddle_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_SuicideMiddle_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "4bec0bc4e03fc10a414fb3a055b044791456200c123fcf43875430d18645e3f3",
-                    "mixHash" : "c6f899deb833ea2d2876bfd3d87dceb6cc674a3e7da6a512000f827f8f08d885",
-                    "nonce" : "7a9b6dc9261a7223",
+                    "hash" : "0xe783a8262d9d6fddb93ae9d7015edea03375775a24aa91c1489e40111f107e02",
+                    "mixHash" : "0x54883517de8ddf55391c51d950eb996005dcbb3d22e99a1f978a0279dafe5ff8",
+                    "nonce" : "0xdb3e407dbb8bba46",
                     "number" : "0x01",
-                    "parentHash" : "2b98ed30defda36d7fb96883ca23d5fdf13fa6d5536e97cb01bdd4a77207ff22",
-                    "receiptTrie" : "f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1",
-                    "stateRoot" : "ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07",
+                    "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+                    "receiptTrie" : "0xf5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1",
+                    "stateRoot" : "0xef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a02b98ed30defda36d7fb96883ca23d5fdf13fa6d5536e97cb01bdd4a77207ff22a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0c6f899deb833ea2d2876bfd3d87dceb6cc674a3e7da6a512000f827f8f08d885887a9b6dc9261a7223f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a054883517de8ddf55391c51d950eb996005dcbb3d22e99a1f978a0279dafe5ff888db3e407dbb8bba46f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -176,28 +186,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "2b98ed30defda36d7fb96883ca23d5fdf13fa6d5536e97cb01bdd4a77207ff22",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1f8abb90caf4cb325711422e874cecdf4c4ae077978c9a0ccb95ad6fc9d3ab21",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f8abb90caf4cb325711422e874cecdf4c4ae077978c9a0ccb95ad6fc9d3ab21a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4bec0bc4e03fc10a414fb3a055b044791456200c123fcf43875430d18645e3f3",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe783a8262d9d6fddb93ae9d7015edea03375775a24aa91c1489e40111f107e02",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -205,7 +215,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -213,60 +223,60 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4a9c7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7635639",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -274,36 +284,41 @@
         }
     },
     "callcallcall_000_SuicideMiddle_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_SuicideMiddle_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9117",
-                    "hash" : "3917e715bdfed074f882130ba8e1a44c0e86f0799eeb76ea588ce7e5aa8e0903",
-                    "mixHash" : "c5f66676c23bb811401cefaa22ff015632c140011efefa47cd6c0d23b815a3c0",
-                    "nonce" : "0af0bd806bf46461",
+                    "hash" : "0x4cd6fe89887bdd31d5ae9db3c3e57f76b0398c4cebdcfb721fa3c8d009f37fcc",
+                    "mixHash" : "0xd65be070398a098795de65626f9bac77593938ae65e780ce4353e522990fa4d3",
+                    "nonce" : "0xbcd2e7cac493a1a5",
                     "number" : "0x01",
-                    "parentHash" : "2b98ed30defda36d7fb96883ca23d5fdf13fa6d5536e97cb01bdd4a77207ff22",
-                    "receiptTrie" : "1c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698a",
-                    "stateRoot" : "488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abf",
+                    "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+                    "receiptTrie" : "0x1c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698a",
+                    "stateRoot" : "0x488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abf",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a02b98ed30defda36d7fb96883ca23d5fdf13fa6d5536e97cb01bdd4a77207ff22a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0c5f66676c23bb811401cefaa22ff015632c140011efefa47cd6c0d23b815a3c0880af0bd806bf46461f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0d65be070398a098795de65626f9bac77593938ae65e780ce4353e522990fa4d388bcd2e7cac493a1a5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -313,28 +328,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "2b98ed30defda36d7fb96883ca23d5fdf13fa6d5536e97cb01bdd4a77207ff22",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1f8abb90caf4cb325711422e874cecdf4c4ae077978c9a0ccb95ad6fc9d3ab21",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f8abb90caf4cb325711422e874cecdf4c4ae077978c9a0ccb95ad6fc9d3ab21a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3917e715bdfed074f882130ba8e1a44c0e86f0799eeb76ea588ce7e5aa8e0903",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4cd6fe89887bdd31d5ae9db3c3e57f76b0398c4cebdcfb721fa3c8d009f37fcc",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -342,7 +357,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -350,60 +365,60 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f49117",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7636ee9",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -411,36 +426,41 @@
         }
     },
     "callcallcall_000_SuicideMiddle_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_SuicideMiddle_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9117",
-                    "hash" : "4644221429b1954f56defa8fafe38f01eec599d1342b8c7939ddf96cff21a8ef",
-                    "mixHash" : "229ebf9c54a7f7fb78db2ab2bed1749c2e77ba2550a5e8330c3ead710422e5f7",
-                    "nonce" : "49561eba36b178f7",
+                    "hash" : "0xb04c14d2878ca6ed8624266931c0684f3c77ad7d61a55e681ebfa89f728d9d3e",
+                    "mixHash" : "0xc843eef90011a5fe4d2929c17fe9c7faf3607a8bcdff26c28d7623c30359c0d9",
+                    "nonce" : "0xcd9465ad8e8dade0",
                     "number" : "0x01",
-                    "parentHash" : "2b98ed30defda36d7fb96883ca23d5fdf13fa6d5536e97cb01bdd4a77207ff22",
-                    "receiptTrie" : "1c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698a",
-                    "stateRoot" : "488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abf",
+                    "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+                    "receiptTrie" : "0x1c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698a",
+                    "stateRoot" : "0x488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abf",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a02b98ed30defda36d7fb96883ca23d5fdf13fa6d5536e97cb01bdd4a77207ff22a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0229ebf9c54a7f7fb78db2ab2bed1749c2e77ba2550a5e8330c3ead710422e5f78849561eba36b178f7f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0c843eef90011a5fe4d2929c17fe9c7faf3607a8bcdff26c28d7623c30359c0d988cd9465ad8e8dade0f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -450,28 +470,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "2b98ed30defda36d7fb96883ca23d5fdf13fa6d5536e97cb01bdd4a77207ff22",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1f8abb90caf4cb325711422e874cecdf4c4ae077978c9a0ccb95ad6fc9d3ab21",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f8abb90caf4cb325711422e874cecdf4c4ae077978c9a0ccb95ad6fc9d3ab21a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4644221429b1954f56defa8fafe38f01eec599d1342b8c7939ddf96cff21a8ef",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb04c14d2878ca6ed8624266931c0684f3c77ad7d61a55e681ebfa89f728d9d3e",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -479,7 +499,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -487,60 +507,209 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f49117",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7636ee9",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x170d1899c9f863e54bbf090a4a9f3218fd0b8f0e54f0e586cdd142133c5668b8",
+                    "mixHash" : "0xaae4ba1f6ca65bb6b5e2ba9acfe964a97acc33a4dac8d506756a1ea98eb58c41",
+                    "nonce" : "0x94495c5fbe33b747",
+                    "number" : "0x01",
+                    "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x4c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0aae4ba1f6ca65bb6b5e2ba9acfe964a97acc33a4dac8d506756a1ea98eb58c418894495c5fbe33b747f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x170d1899c9f863e54bbf090a4a9f3218fd0b8f0e54f0e586cdd142133c5668b8",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_d0g0v0.json
index 4a678f3da..cd18c9919 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcall_000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "bb74d5705ef360e9cc01c080144ecd5af13e51cafaa1b79076026329f5eda8ae",
-                    "mixHash" : "6daeb11557cb6566dce8c66d1a9b0ef6cc34baa2892e28b20cdc610e96871944",
-                    "nonce" : "7af0cf34d9c91e8a",
+                    "hash" : "0xf68b8f2d68c36804c8fc9ac14af8619e78e99c9331efcfbbfbe560f40c7eb130",
+                    "mixHash" : "0x34a07310c20fbdd28c69a10c40aa90b647b172ad6b1eff28278f2a58739c2c02",
+                    "nonce" : "0x1500b4f9258148aa",
                     "number" : "0x01",
-                    "parentHash" : "2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
-                    "receiptTrie" : "e51972c1167e0d27bb1242ddc7e09c6f87ab4a84e9edc5431d4e8f55c6baf79b",
-                    "stateRoot" : "cea94434f25b201a9daf55ffd5f2baab551a1574a56ce8595e72c0db866a8d5f",
+                    "parentHash" : "0x2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
+                    "receiptTrie" : "0xe51972c1167e0d27bb1242ddc7e09c6f87ab4a84e9edc5431d4e8f55c6baf79b",
+                    "stateRoot" : "0xcea94434f25b201a9daf55ffd5f2baab551a1574a56ce8595e72c0db866a8d5f",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cea94434f25b201a9daf55ffd5f2baab551a1574a56ce8595e72c0db866a8d5fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e51972c1167e0d27bb1242ddc7e09c6f87ab4a84e9edc5431d4e8f55c6baf79bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a06daeb11557cb6566dce8c66d1a9b0ef6cc34baa2892e28b20cdc610e96871944887af0cf34d9c91e8af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a02184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cea94434f25b201a9daf55ffd5f2baab551a1574a56ce8595e72c0db866a8d5fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e51972c1167e0d27bb1242ddc7e09c6f87ab4a84e9edc5431d4e8f55c6baf79bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a034a07310c20fbdd28c69a10c40aa90b647b172ad6b1eff28278f2a58739c2c02881500b4f9258148aaf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8df8bcff120c061e9ec1e0c494f9ab50ab73deec77568c5ebf41823ce5a8c399",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8df8bcff120c061e9ec1e0c494f9ab50ab73deec77568c5ebf41823ce5a8c399",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08df8bcff120c061e9ec1e0c494f9ab50ab73deec77568c5ebf41823ce5a8c399a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "bb74d5705ef360e9cc01c080144ecd5af13e51cafaa1b79076026329f5eda8ae",
+        "lastblockhash" : "0xf68b8f2d68c36804c8fc9ac14af8619e78e99c9331efcfbbfbe560f40c7eb130",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
@@ -76,7 +81,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
@@ -84,7 +89,7 @@
                     "0x02" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x03",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
@@ -99,53 +104,53 @@
                     "0x07" : "0x03"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f804a3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ffb5d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -153,36 +158,41 @@
         }
     },
     "callcallcall_000_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "bb1e9498181663a0982a312bb43c5cbc94f5a2167da9660430926b2ff2041da6",
-                    "mixHash" : "08a8958094895b2357d90af342e652a44999d93b4b1125d2da098588ab1fc9e4",
-                    "nonce" : "e918fe5a80872ad0",
+                    "hash" : "0x58de1bf259261d32b3a2fd1ae7df6e1a83f6812e8ff8c4f5788317f0cd110a2b",
+                    "mixHash" : "0x89143e355c0cd285b802d3effbe6d595d5fc8753f448272a636d80cd8e396d06",
+                    "nonce" : "0xa6ace59c038646e8",
                     "number" : "0x01",
-                    "parentHash" : "2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
-                    "receiptTrie" : "e51972c1167e0d27bb1242ddc7e09c6f87ab4a84e9edc5431d4e8f55c6baf79b",
-                    "stateRoot" : "cea94434f25b201a9daf55ffd5f2baab551a1574a56ce8595e72c0db866a8d5f",
+                    "parentHash" : "0x2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
+                    "receiptTrie" : "0xe51972c1167e0d27bb1242ddc7e09c6f87ab4a84e9edc5431d4e8f55c6baf79b",
+                    "stateRoot" : "0xcea94434f25b201a9daf55ffd5f2baab551a1574a56ce8595e72c0db866a8d5f",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cea94434f25b201a9daf55ffd5f2baab551a1574a56ce8595e72c0db866a8d5fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e51972c1167e0d27bb1242ddc7e09c6f87ab4a84e9edc5431d4e8f55c6baf79bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a008a8958094895b2357d90af342e652a44999d93b4b1125d2da098588ab1fc9e488e918fe5a80872ad0f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a02184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cea94434f25b201a9daf55ffd5f2baab551a1574a56ce8595e72c0db866a8d5fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e51972c1167e0d27bb1242ddc7e09c6f87ab4a84e9edc5431d4e8f55c6baf79bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a089143e355c0cd285b802d3effbe6d595d5fc8753f448272a636d80cd8e396d0688a6ace59c038646e8f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -192,28 +202,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8df8bcff120c061e9ec1e0c494f9ab50ab73deec77568c5ebf41823ce5a8c399",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8df8bcff120c061e9ec1e0c494f9ab50ab73deec77568c5ebf41823ce5a8c399",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08df8bcff120c061e9ec1e0c494f9ab50ab73deec77568c5ebf41823ce5a8c399a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "bb1e9498181663a0982a312bb43c5cbc94f5a2167da9660430926b2ff2041da6",
+        "lastblockhash" : "0x58de1bf259261d32b3a2fd1ae7df6e1a83f6812e8ff8c4f5788317f0cd110a2b",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -221,7 +231,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
@@ -229,7 +239,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
@@ -237,7 +247,7 @@
                     "0x02" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x03",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
@@ -252,53 +262,53 @@
                     "0x07" : "0x03"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f804a3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ffb5d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -306,36 +316,41 @@
         }
     },
     "callcallcall_000_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "35963476131cf395f087673d0c507d88a0c7b029b41465c44e4eff8cac4b2ef1",
-                    "mixHash" : "21eccb400a5213bf2b0dae0c5812cd82b90f9157346b3aad1be9359626726171",
-                    "nonce" : "e0936bb7803f23e2",
+                    "hash" : "0x28cda8041ff735029086144122759195c4261cd430eea9181a6549350da56cbf",
+                    "mixHash" : "0xf0502ccfddd6da3b45d848107c4c12fe55255a2147d86ac0b787e042984da4bb",
+                    "nonce" : "0x229fb6b2f6cb8a0f",
                     "number" : "0x01",
-                    "parentHash" : "2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
-                    "receiptTrie" : "a8b92d2f23cd0872f21a706f81d77b3fc0e5a65f2be79333ac07604bc54c7d23",
-                    "stateRoot" : "4288b168527250f90ba63c91f508fe84b7e247afec6759fb5cc9db72fe9feac0",
+                    "parentHash" : "0x2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
+                    "receiptTrie" : "0xa8b92d2f23cd0872f21a706f81d77b3fc0e5a65f2be79333ac07604bc54c7d23",
+                    "stateRoot" : "0x4288b168527250f90ba63c91f508fe84b7e247afec6759fb5cc9db72fe9feac0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04288b168527250f90ba63c91f508fe84b7e247afec6759fb5cc9db72fe9feac0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0a8b92d2f23cd0872f21a706f81d77b3fc0e5a65f2be79333ac07604bc54c7d23b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a021eccb400a5213bf2b0dae0c5812cd82b90f9157346b3aad1be935962672617188e0936bb7803f23e2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a02184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04288b168527250f90ba63c91f508fe84b7e247afec6759fb5cc9db72fe9feac0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0a8b92d2f23cd0872f21a706f81d77b3fc0e5a65f2be79333ac07604bc54c7d23b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0f0502ccfddd6da3b45d848107c4c12fe55255a2147d86ac0b787e042984da4bb88229fb6b2f6cb8a0ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -345,28 +360,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8df8bcff120c061e9ec1e0c494f9ab50ab73deec77568c5ebf41823ce5a8c399",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8df8bcff120c061e9ec1e0c494f9ab50ab73deec77568c5ebf41823ce5a8c399",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08df8bcff120c061e9ec1e0c494f9ab50ab73deec77568c5ebf41823ce5a8c399a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "35963476131cf395f087673d0c507d88a0c7b029b41465c44e4eff8cac4b2ef1",
+        "lastblockhash" : "0x28cda8041ff735029086144122759195c4261cd430eea9181a6549350da56cbf",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -374,7 +389,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
@@ -382,7 +397,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
@@ -390,7 +405,7 @@
                     "0x02" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x03",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
@@ -405,53 +420,53 @@
                     "0x07" : "0x03"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7fce7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7600319",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -459,36 +474,41 @@
         }
     },
     "callcallcall_000_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "12bc6c1175c3310d35463a96808fd620912895399d444cf26c2edb11c2de972b",
-                    "mixHash" : "31eebe05116ab60bcd470e53d545c3a4791b48cec78a6756523d24b83ec89f80",
-                    "nonce" : "42f2ef956a0c94d2",
+                    "hash" : "0x7092824abdce085218a73a46720dddb922e12008959febc477a1ca55f1750a91",
+                    "mixHash" : "0x67321dcf3f9c82f8ed2d81dfd92e701f26c029cba8cbe545359d1c3481e1279f",
+                    "nonce" : "0x316387c592a16c00",
                     "number" : "0x01",
-                    "parentHash" : "2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
-                    "receiptTrie" : "a8b92d2f23cd0872f21a706f81d77b3fc0e5a65f2be79333ac07604bc54c7d23",
-                    "stateRoot" : "4288b168527250f90ba63c91f508fe84b7e247afec6759fb5cc9db72fe9feac0",
+                    "parentHash" : "0x2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
+                    "receiptTrie" : "0xa8b92d2f23cd0872f21a706f81d77b3fc0e5a65f2be79333ac07604bc54c7d23",
+                    "stateRoot" : "0x4288b168527250f90ba63c91f508fe84b7e247afec6759fb5cc9db72fe9feac0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04288b168527250f90ba63c91f508fe84b7e247afec6759fb5cc9db72fe9feac0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0a8b92d2f23cd0872f21a706f81d77b3fc0e5a65f2be79333ac07604bc54c7d23b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a031eebe05116ab60bcd470e53d545c3a4791b48cec78a6756523d24b83ec89f808842f2ef956a0c94d2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a02184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04288b168527250f90ba63c91f508fe84b7e247afec6759fb5cc9db72fe9feac0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0a8b92d2f23cd0872f21a706f81d77b3fc0e5a65f2be79333ac07604bc54c7d23b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a067321dcf3f9c82f8ed2d81dfd92e701f26c029cba8cbe545359d1c3481e1279f88316387c592a16c00f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -498,28 +518,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8df8bcff120c061e9ec1e0c494f9ab50ab73deec77568c5ebf41823ce5a8c399",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8df8bcff120c061e9ec1e0c494f9ab50ab73deec77568c5ebf41823ce5a8c399",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08df8bcff120c061e9ec1e0c494f9ab50ab73deec77568c5ebf41823ce5a8c399a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "12bc6c1175c3310d35463a96808fd620912895399d444cf26c2edb11c2de972b",
+        "lastblockhash" : "0x7092824abdce085218a73a46720dddb922e12008959febc477a1ca55f1750a91",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -527,7 +547,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
@@ -535,7 +555,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
@@ -543,7 +563,7 @@
                     "0x02" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x03",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
@@ -558,53 +578,218 @@
                     "0x07" : "0x03"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7fce7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7600319",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0xc677b486eeb46fccc01aa532dade915840154920a5e8b0c8c0d5f0557c9f3996",
+                    "mixHash" : "0x9cc9cfefb9a33752824a4685bb755218e0793406e4e86dcfeca1806e50e64bad",
+                    "nonce" : "0xd721a3fbd2e6f472",
+                    "number" : "0x01",
+                    "parentHash" : "0x2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0xfa5415d78e87c23a7a2a4e9cb43fa80471dd3233105f4d4398317508dc47db2b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a02184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fa5415d78e87c23a7a2a4e9cb43fa80471dd3233105f4d4398317508dc47db2ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a09cc9cfefb9a33752824a4685bb755218e0793406e4e86dcfeca1806e50e64bad88d721a3fbd2e6f472f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xc677b486eeb46fccc01aa532dade915840154920a5e8b0c8c0d5f0557c9f3996",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE_d0g0v0.json
index 2f2341a45..699646a2b 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcall_ABCB_RECURSIVE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "99317f2f474a4477f28ee131d4f40dac0e580510924663750bc206a808ab2990",
-                    "mixHash" : "6d89253e19fffec3c1e3b4a11debd85560474b55dca473453bdf8cb6a8425c89",
-                    "nonce" : "235504413a944b08",
+                    "hash" : "0xffb11d4ed5b47b70cf68fc36c32867ece46932a7619cc803147d40c0e8f7c743",
+                    "mixHash" : "0x6098a4418adae24dabb383f80739ce8b9aeaefea1c54160edc2c3c01fbb721fd",
+                    "nonce" : "0x3d89e50c6de272d2",
                     "number" : "0x01",
-                    "parentHash" : "6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
-                    "receiptTrie" : "77d7ee7fd35519e7c25f66243a97e6e9e8613f8271791f110c9b075c551fe9e7",
-                    "stateRoot" : "c2e1bd714c8f50d270d431421c1fe138488370d6749fa8747bd71aaea0367c14",
+                    "parentHash" : "0x6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
+                    "receiptTrie" : "0x77d7ee7fd35519e7c25f66243a97e6e9e8613f8271791f110c9b075c551fe9e7",
+                    "stateRoot" : "0xc2e1bd714c8f50d270d431421c1fe138488370d6749fa8747bd71aaea0367c14",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a06b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2e1bd714c8f50d270d431421c1fe138488370d6749fa8747bd71aaea0367c14a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a077d7ee7fd35519e7c25f66243a97e6e9e8613f8271791f110c9b075c551fe9e7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a06d89253e19fffec3c1e3b4a11debd85560474b55dca473453bdf8cb6a8425c8988235504413a944b08f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a06b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2e1bd714c8f50d270d431421c1fe138488370d6749fa8747bd71aaea0367c14a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a077d7ee7fd35519e7c25f66243a97e6e9e8613f8271791f110c9b075c551fe9e7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a06098a4418adae24dabb383f80739ce8b9aeaefea1c54160edc2c3c01fbb721fd883d89e50c6de272d2f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "edf64ec7abb644cf31477ad9e16752a84d360b04425eb34b100a333d88e7a335",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xedf64ec7abb644cf31477ad9e16752a84d360b04425eb34b100a333d88e7a335",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf64ec7abb644cf31477ad9e16752a84d360b04425eb34b100a333d88e7a335a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "99317f2f474a4477f28ee131d4f40dac0e580510924663750bc206a808ab2990",
+        "lastblockhash" : "0xffb11d4ed5b47b70cf68fc36c32867ece46932a7619cc803147d40c0e8f7c743",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
@@ -76,53 +81,53 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fcab7e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5482",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -130,36 +135,41 @@
         }
     },
     "callcallcall_ABCB_RECURSIVE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "e1c068b3073144f85dfa51431adb9d22caf837d96ecb1570b8eaf247b3b69246",
-                    "mixHash" : "deb9966c6b11a35739f6dfca7322881d0e4049e8d15517ab4289ac35e524ee9d",
-                    "nonce" : "d6153085c1371091",
+                    "hash" : "0xace3100f2d30375c8bc44b6b3c05c82183a288f6de62836bfe09e70bcb835d24",
+                    "mixHash" : "0xf0156c43e28170684f66f4e89caf738cd2298c4a0a305594d832279a199da3fd",
+                    "nonce" : "0x4ea2976fb0eb4c56",
                     "number" : "0x01",
-                    "parentHash" : "6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
-                    "receiptTrie" : "77d7ee7fd35519e7c25f66243a97e6e9e8613f8271791f110c9b075c551fe9e7",
-                    "stateRoot" : "c2e1bd714c8f50d270d431421c1fe138488370d6749fa8747bd71aaea0367c14",
+                    "parentHash" : "0x6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
+                    "receiptTrie" : "0x77d7ee7fd35519e7c25f66243a97e6e9e8613f8271791f110c9b075c551fe9e7",
+                    "stateRoot" : "0xc2e1bd714c8f50d270d431421c1fe138488370d6749fa8747bd71aaea0367c14",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a06b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2e1bd714c8f50d270d431421c1fe138488370d6749fa8747bd71aaea0367c14a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a077d7ee7fd35519e7c25f66243a97e6e9e8613f8271791f110c9b075c551fe9e7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0deb9966c6b11a35739f6dfca7322881d0e4049e8d15517ab4289ac35e524ee9d88d6153085c1371091f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a06b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2e1bd714c8f50d270d431421c1fe138488370d6749fa8747bd71aaea0367c14a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a077d7ee7fd35519e7c25f66243a97e6e9e8613f8271791f110c9b075c551fe9e7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0f0156c43e28170684f66f4e89caf738cd2298c4a0a305594d832279a199da3fd884ea2976fb0eb4c56f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -169,28 +179,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "edf64ec7abb644cf31477ad9e16752a84d360b04425eb34b100a333d88e7a335",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xedf64ec7abb644cf31477ad9e16752a84d360b04425eb34b100a333d88e7a335",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf64ec7abb644cf31477ad9e16752a84d360b04425eb34b100a333d88e7a335a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e1c068b3073144f85dfa51431adb9d22caf837d96ecb1570b8eaf247b3b69246",
+        "lastblockhash" : "0xace3100f2d30375c8bc44b6b3c05c82183a288f6de62836bfe09e70bcb835d24",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
@@ -198,7 +208,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
@@ -206,53 +216,53 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fcab7e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5482",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -260,36 +270,41 @@
         }
     },
     "callcallcall_ABCB_RECURSIVE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "506909596c815ef9cd8d41399de607a7b2644f29787459f22cccf0fcafd56078",
-                    "mixHash" : "b7b5acdbb669a1ea0e6db623cfa9ced6601df8ad501a43b87bfc54463dfdd9dc",
-                    "nonce" : "bd521763acd9ed71",
+                    "hash" : "0xd14db6a5ece5c2db407da8f885ca8688c61ce42ce27415b8942810e6ac7be8ba",
+                    "mixHash" : "0xd762400fa2c3c36e2a5aecc079dcb4615f516a2619ddaa18ff254930ed7a5dd2",
+                    "nonce" : "0x25cecd03eabc7a57",
                     "number" : "0x01",
-                    "parentHash" : "6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
-                    "receiptTrie" : "0a0793dccd436aa9e06afb50e258682ce942511ce28966759dca70a9ec0c012f",
-                    "stateRoot" : "2b6ff613230b0c9f185281a8abccad47488a65396c843438749baf333367522c",
+                    "parentHash" : "0x6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
+                    "receiptTrie" : "0x0a0793dccd436aa9e06afb50e258682ce942511ce28966759dca70a9ec0c012f",
+                    "stateRoot" : "0x2b6ff613230b0c9f185281a8abccad47488a65396c843438749baf333367522c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a06b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b6ff613230b0c9f185281a8abccad47488a65396c843438749baf333367522ca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a00a0793dccd436aa9e06afb50e258682ce942511ce28966759dca70a9ec0c012fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0b7b5acdbb669a1ea0e6db623cfa9ced6601df8ad501a43b87bfc54463dfdd9dc88bd521763acd9ed71f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a06b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b6ff613230b0c9f185281a8abccad47488a65396c843438749baf333367522ca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a00a0793dccd436aa9e06afb50e258682ce942511ce28966759dca70a9ec0c012fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0d762400fa2c3c36e2a5aecc079dcb4615f516a2619ddaa18ff254930ed7a5dd28825cecd03eabc7a57f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -299,28 +314,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "edf64ec7abb644cf31477ad9e16752a84d360b04425eb34b100a333d88e7a335",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xedf64ec7abb644cf31477ad9e16752a84d360b04425eb34b100a333d88e7a335",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf64ec7abb644cf31477ad9e16752a84d360b04425eb34b100a333d88e7a335a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "506909596c815ef9cd8d41399de607a7b2644f29787459f22cccf0fcafd56078",
+        "lastblockhash" : "0xd14db6a5ece5c2db407da8f885ca8688c61ce42ce27415b8942810e6ac7be8ba",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
@@ -328,7 +343,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
@@ -336,53 +351,53 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fca3c2",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5c3e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -390,36 +405,41 @@
         }
     },
     "callcallcall_ABCB_RECURSIVE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "b700286c609791351522a1ac0cb8f410dc0d40c94ce81bec209c001f1f6cdd3a",
-                    "mixHash" : "755adc132d0cb943e10adce2a4a93485e4b3394c10c0da870174015da33e0387",
-                    "nonce" : "bca4cae9aa496c5b",
+                    "hash" : "0x1150230a86a3be47d741ee1284b5a04af0a86c612427cc54a08de054c220606d",
+                    "mixHash" : "0xd9a7c13e4f9dbf0e826396abcec7a44259b46f018037b5396018fe2bd0155115",
+                    "nonce" : "0x36df7e37f446ed05",
                     "number" : "0x01",
-                    "parentHash" : "6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
-                    "receiptTrie" : "0a0793dccd436aa9e06afb50e258682ce942511ce28966759dca70a9ec0c012f",
-                    "stateRoot" : "2b6ff613230b0c9f185281a8abccad47488a65396c843438749baf333367522c",
+                    "parentHash" : "0x6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
+                    "receiptTrie" : "0x0a0793dccd436aa9e06afb50e258682ce942511ce28966759dca70a9ec0c012f",
+                    "stateRoot" : "0x2b6ff613230b0c9f185281a8abccad47488a65396c843438749baf333367522c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a06b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b6ff613230b0c9f185281a8abccad47488a65396c843438749baf333367522ca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a00a0793dccd436aa9e06afb50e258682ce942511ce28966759dca70a9ec0c012fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0755adc132d0cb943e10adce2a4a93485e4b3394c10c0da870174015da33e038788bca4cae9aa496c5bf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a06b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b6ff613230b0c9f185281a8abccad47488a65396c843438749baf333367522ca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a00a0793dccd436aa9e06afb50e258682ce942511ce28966759dca70a9ec0c012fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0d9a7c13e4f9dbf0e826396abcec7a44259b46f018037b5396018fe2bd01551158836df7e37f446ed05f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -429,28 +449,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "edf64ec7abb644cf31477ad9e16752a84d360b04425eb34b100a333d88e7a335",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xedf64ec7abb644cf31477ad9e16752a84d360b04425eb34b100a333d88e7a335",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf64ec7abb644cf31477ad9e16752a84d360b04425eb34b100a333d88e7a335a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b700286c609791351522a1ac0cb8f410dc0d40c94ce81bec209c001f1f6cdd3a",
+        "lastblockhash" : "0x1150230a86a3be47d741ee1284b5a04af0a86c612427cc54a08de054c220606d",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
@@ -458,7 +478,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
@@ -466,53 +486,195 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fca3c2",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5c3e",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x294aa7db8fe2edcebed104aaf2e99e73aa55cc861100e791728a90104d01d6cc",
+                    "mixHash" : "0x91ce6f922314aa624f21bf582d15e83681a94a5d6f01d550315db98e0048a3de",
+                    "nonce" : "0x02d88e1bdfbef0f8",
+                    "number" : "0x01",
+                    "parentHash" : "0x6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0xd4ae1cb190ed174df265bdd6cc9e5491f0c9818fdae917fc03c42a951daf6d91",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a06b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d4ae1cb190ed174df265bdd6cc9e5491f0c9818fdae917fc03c42a951daf6d91a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a091ce6f922314aa624f21bf582d15e83681a94a5d6f01d550315db98e0048a3de8802d88e1bdfbef0f8f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "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" : "0x294aa7db8fe2edcebed104aaf2e99e73aa55cc861100e791728a90104d01d6cc",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE_d0g0v0.json
index 94faf3468..97aa9d439 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcallcode_001_OOGE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "6cbadcf29918124fb419245501fff82d2770feeb0bd0a5ba5e358dfaa1e7bc87",
-                    "mixHash" : "9f7e5c1f088f07dd8637b2cd20c0cc790eb6c6911e4dd4e0508e9a82331a8b8b",
-                    "nonce" : "a6e016fa9e2ca2c2",
+                    "hash" : "0x96d6a953a6a1834528142d3ef7549815d2e712d403b41babd66a0053a1fe0858",
+                    "mixHash" : "0x5f53d12fa250164e54c134560ad70d583913963ba98380aca01c9c71d93013ca",
+                    "nonce" : "0x641888ff1fdb20a2",
                     "number" : "0x01",
-                    "parentHash" : "288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
-                    "receiptTrie" : "2d4d9c33287775c0a02b1993e4c3f959d11a66f643674de63b2f0162ffdb0d4b",
-                    "stateRoot" : "9c2ee8ba72f651fb259911d99f03279b176123820eb6df36b2c6d5e03a44b315",
+                    "parentHash" : "0x288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
+                    "receiptTrie" : "0x2d4d9c33287775c0a02b1993e4c3f959d11a66f643674de63b2f0162ffdb0d4b",
+                    "stateRoot" : "0x9c2ee8ba72f651fb259911d99f03279b176123820eb6df36b2c6d5e03a44b315",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c2ee8ba72f651fb259911d99f03279b176123820eb6df36b2c6d5e03a44b315a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02d4d9c33287775c0a02b1993e4c3f959d11a66f643674de63b2f0162ffdb0d4bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a09f7e5c1f088f07dd8637b2cd20c0cc790eb6c6911e4dd4e0508e9a82331a8b8b88a6e016fa9e2ca2c2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c2ee8ba72f651fb259911d99f03279b176123820eb6df36b2c6d5e03a44b315a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02d4d9c33287775c0a02b1993e4c3f959d11a66f643674de63b2f0162ffdb0d4bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a05f53d12fa250164e54c134560ad70d583913963ba98380aca01c9c71d93013ca88641888ff1fdb20a2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b8cc7d6596eae7e22f010a5eb9fce3d34f06cc3a1ff1e7b17da82678240f1048",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb8cc7d6596eae7e22f010a5eb9fce3d34f06cc3a1ff1e7b17da82678240f1048",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8cc7d6596eae7e22f010a5eb9fce3d34f06cc3a1ff1e7b17da82678240f1048a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "6cbadcf29918124fb419245501fff82d2770feeb0bd0a5ba5e358dfaa1e7bc87",
+        "lastblockhash" : "0x96d6a953a6a1834528142d3ef7549815d2e712d403b41babd66a0053a1fe0858",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -76,67 +81,67 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55892",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762a76e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -144,36 +149,41 @@
         }
     },
     "callcallcallcode_001_OOGE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "9188e2233c7c26984fbc1443f9359d666ff716f52cfd099713cb1065bb773b52",
-                    "mixHash" : "040bab439bc02bfe6cfd4e409540971eca202602d0753543eb78f0df9407eed4",
-                    "nonce" : "f9845970b725c7af",
+                    "hash" : "0x8b8ee9364fd1acaed9244b32b731e902a6e3d6dd706b53df35aaa29a76478676",
+                    "mixHash" : "0xa1eb2aecfa0bfe8b3f0dde661aad5ee5e7d7ae1dacbc0f695c6b628751451347",
+                    "nonce" : "0x6a0bc238df3755f6",
                     "number" : "0x01",
-                    "parentHash" : "288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
-                    "receiptTrie" : "2d4d9c33287775c0a02b1993e4c3f959d11a66f643674de63b2f0162ffdb0d4b",
-                    "stateRoot" : "9c2ee8ba72f651fb259911d99f03279b176123820eb6df36b2c6d5e03a44b315",
+                    "parentHash" : "0x288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
+                    "receiptTrie" : "0x2d4d9c33287775c0a02b1993e4c3f959d11a66f643674de63b2f0162ffdb0d4b",
+                    "stateRoot" : "0x9c2ee8ba72f651fb259911d99f03279b176123820eb6df36b2c6d5e03a44b315",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c2ee8ba72f651fb259911d99f03279b176123820eb6df36b2c6d5e03a44b315a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02d4d9c33287775c0a02b1993e4c3f959d11a66f643674de63b2f0162ffdb0d4bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0040bab439bc02bfe6cfd4e409540971eca202602d0753543eb78f0df9407eed488f9845970b725c7aff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c2ee8ba72f651fb259911d99f03279b176123820eb6df36b2c6d5e03a44b315a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02d4d9c33287775c0a02b1993e4c3f959d11a66f643674de63b2f0162ffdb0d4bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0a1eb2aecfa0bfe8b3f0dde661aad5ee5e7d7ae1dacbc0f695c6b628751451347886a0bc238df3755f6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -183,28 +193,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b8cc7d6596eae7e22f010a5eb9fce3d34f06cc3a1ff1e7b17da82678240f1048",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb8cc7d6596eae7e22f010a5eb9fce3d34f06cc3a1ff1e7b17da82678240f1048",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8cc7d6596eae7e22f010a5eb9fce3d34f06cc3a1ff1e7b17da82678240f1048a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9188e2233c7c26984fbc1443f9359d666ff716f52cfd099713cb1065bb773b52",
+        "lastblockhash" : "0x8b8ee9364fd1acaed9244b32b731e902a6e3d6dd706b53df35aaa29a76478676",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -212,7 +222,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -220,67 +230,67 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55892",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762a76e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -288,36 +298,41 @@
         }
     },
     "callcallcallcode_001_OOGE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "69952f60a2193b6c97435ffa3b25432ba181cc00ee6ce17032f14b615fcd7de2",
-                    "mixHash" : "59691d7a76ddcbed3e87cdc0257b2917a683d06cd9d0e9a8ea03f929cbefe062",
-                    "nonce" : "0b1e9fc6ce5a243f",
+                    "hash" : "0x58836fead519701a317a5860385609c7a481b94ef33d7e5dace26b8b72a924af",
+                    "mixHash" : "0x96125aa2e47b52678649c31dc10a47f7582fa09c4e4f6974c5606a04a7ddcf8b",
+                    "nonce" : "0x89122157f380784e",
                     "number" : "0x01",
-                    "parentHash" : "288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
-                    "receiptTrie" : "952a20170f4da5a8b65715b63eb61a95660c91f7c523c2319102b675c02c7089",
-                    "stateRoot" : "5b146f6f104eb52fa6c874b020576cfeef795e770e28779d41284565fa056e11",
+                    "parentHash" : "0x288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
+                    "receiptTrie" : "0x952a20170f4da5a8b65715b63eb61a95660c91f7c523c2319102b675c02c7089",
+                    "stateRoot" : "0x5b146f6f104eb52fa6c874b020576cfeef795e770e28779d41284565fa056e11",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b146f6f104eb52fa6c874b020576cfeef795e770e28779d41284565fa056e11a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0952a20170f4da5a8b65715b63eb61a95660c91f7c523c2319102b675c02c7089b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a059691d7a76ddcbed3e87cdc0257b2917a683d06cd9d0e9a8ea03f929cbefe062880b1e9fc6ce5a243ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b146f6f104eb52fa6c874b020576cfeef795e770e28779d41284565fa056e11a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0952a20170f4da5a8b65715b63eb61a95660c91f7c523c2319102b675c02c7089b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a096125aa2e47b52678649c31dc10a47f7582fa09c4e4f6974c5606a04a7ddcf8b8889122157f380784ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -327,28 +342,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b8cc7d6596eae7e22f010a5eb9fce3d34f06cc3a1ff1e7b17da82678240f1048",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb8cc7d6596eae7e22f010a5eb9fce3d34f06cc3a1ff1e7b17da82678240f1048",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8cc7d6596eae7e22f010a5eb9fce3d34f06cc3a1ff1e7b17da82678240f1048a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "69952f60a2193b6c97435ffa3b25432ba181cc00ee6ce17032f14b615fcd7de2",
+        "lastblockhash" : "0x58836fead519701a317a5860385609c7a481b94ef33d7e5dace26b8b72a924af",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -356,7 +371,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -364,67 +379,67 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550d6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af2a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -432,36 +447,41 @@
         }
     },
     "callcallcallcode_001_OOGE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "e27d191b15ed0d668cf80a318f8ded78fb8ab7cdc795fefd6fc3feb1655cbd8a",
-                    "mixHash" : "0e843f89ba2bde4d5beca5cc625e4741a4f3a8be3c567aa3a57101ad2288814b",
-                    "nonce" : "a821250bbbd2daad",
+                    "hash" : "0xeb5ad4321377a86afe00cfeab324b2dc7fb68d6f72c0df3e721428dc22310c09",
+                    "mixHash" : "0xaa8081320c00dd99b5d4cecc50379579af689afe928bbde271410973f112fa69",
+                    "nonce" : "0xe8fe35721ee87ddb",
                     "number" : "0x01",
-                    "parentHash" : "288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
-                    "receiptTrie" : "952a20170f4da5a8b65715b63eb61a95660c91f7c523c2319102b675c02c7089",
-                    "stateRoot" : "5b146f6f104eb52fa6c874b020576cfeef795e770e28779d41284565fa056e11",
+                    "parentHash" : "0x288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
+                    "receiptTrie" : "0x952a20170f4da5a8b65715b63eb61a95660c91f7c523c2319102b675c02c7089",
+                    "stateRoot" : "0x5b146f6f104eb52fa6c874b020576cfeef795e770e28779d41284565fa056e11",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b146f6f104eb52fa6c874b020576cfeef795e770e28779d41284565fa056e11a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0952a20170f4da5a8b65715b63eb61a95660c91f7c523c2319102b675c02c7089b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a00e843f89ba2bde4d5beca5cc625e4741a4f3a8be3c567aa3a57101ad2288814b88a821250bbbd2daadf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b146f6f104eb52fa6c874b020576cfeef795e770e28779d41284565fa056e11a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0952a20170f4da5a8b65715b63eb61a95660c91f7c523c2319102b675c02c7089b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0aa8081320c00dd99b5d4cecc50379579af689afe928bbde271410973f112fa6988e8fe35721ee87ddbf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -471,28 +491,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b8cc7d6596eae7e22f010a5eb9fce3d34f06cc3a1ff1e7b17da82678240f1048",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb8cc7d6596eae7e22f010a5eb9fce3d34f06cc3a1ff1e7b17da82678240f1048",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8cc7d6596eae7e22f010a5eb9fce3d34f06cc3a1ff1e7b17da82678240f1048a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e27d191b15ed0d668cf80a318f8ded78fb8ab7cdc795fefd6fc3feb1655cbd8a",
+        "lastblockhash" : "0xeb5ad4321377a86afe00cfeab324b2dc7fb68d6f72c0df3e721428dc22310c09",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -500,7 +520,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -508,67 +528,223 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550d6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af2a",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xbc605a09d17b5df8495f1a3f84ca817e914199c4d7b52010e30427903c21bd20",
+                    "mixHash" : "0xb9f30cbc28c701a6e49bbd7c24b1e041b08f6827059b1ed1338622499f6c797d",
+                    "nonce" : "0x381fd7049c4a3f78",
+                    "number" : "0x01",
+                    "parentHash" : "0x288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0x7671203d02b3c9648089818d892454a26557c853f022a368aefd505d24e77e66",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07671203d02b3c9648089818d892454a26557c853f022a368aefd505d24e77e66a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0b9f30cbc28c701a6e49bbd7c24b1e041b08f6827059b1ed1338622499f6c797d88381fd7049c4a3f78f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0xbc605a09d17b5df8495f1a3f84ca817e914199c4d7b52010e30427903c21bd20",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter_d0g0v0.json
index 99e3bebe2..6c0fb8074 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcallcode_001_OOGMAfter_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "1f74bec70f53700c2119e69099684bfdfbd9d649bf8cb4bf5f38a8b1cf94faab",
-                    "mixHash" : "4f0b962e288901ec65b0a4cb6a7d3efad18384a7d4af0f74ef069f1a3e2da6ca",
-                    "nonce" : "9ffbb2663ff5d057",
+                    "hash" : "0x5e5bab040a72b5e9cc97fc4d766f1450ec8f653b2df37294680eb6d9c46b6eb1",
+                    "mixHash" : "0x7d6bb80a26816be2de02e0d33ea1e3c85c243d38b20658dffffe3423d7a7506f",
+                    "nonce" : "0xa5ebb903cf12b932",
                     "number" : "0x01",
-                    "parentHash" : "98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
-                    "receiptTrie" : "5940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5",
-                    "stateRoot" : "430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52d",
+                    "parentHash" : "0x98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
+                    "receiptTrie" : "0x5940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5",
+                    "stateRoot" : "0x430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a098f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a04f0b962e288901ec65b0a4cb6a7d3efad18384a7d4af0f74ef069f1a3e2da6ca889ffbb2663ff5d057f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a098f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a07d6bb80a26816be2de02e0d33ea1e3c85c243d38b20658dffffe3423d7a7506f88a5ebb903cf12b932f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "1f74bec70f53700c2119e69099684bfdfbd9d649bf8cb4bf5f38a8b1cf94faab",
+        "lastblockhash" : "0x5e5bab040a72b5e9cc97fc4d766f1450ec8f653b2df37294680eb6d9c46b6eb1",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcallcallcode_001_OOGMAfter_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "b8320d1a2a1feb47e9137f9e35335e52f4d6a772de6cb43c98deb79f23c8555b",
-                    "mixHash" : "7251ecc19d4ec7c065f7dfd0b7152650e91605a45dce572c5a918019cb577fbf",
-                    "nonce" : "0d6f8eb4f1b3ba61",
+                    "hash" : "0xbc40563707b4c2a00aa1efb97e603cfb9d2365b40338f5863f842969206e0492",
+                    "mixHash" : "0xc80ff7251216dffc3cd85bbdd8aaeeae55e8b5d96602386bb98cca07efc43e40",
+                    "nonce" : "0xd6fcddd8d8894775",
                     "number" : "0x01",
-                    "parentHash" : "98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
-                    "receiptTrie" : "5940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5",
-                    "stateRoot" : "430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52d",
+                    "parentHash" : "0x98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
+                    "receiptTrie" : "0x5940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5",
+                    "stateRoot" : "0x430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a098f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a07251ecc19d4ec7c065f7dfd0b7152650e91605a45dce572c5a918019cb577fbf880d6f8eb4f1b3ba61f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a098f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0c80ff7251216dffc3cd85bbdd8aaeeae55e8b5d96602386bb98cca07efc43e4088d6fcddd8d8894775f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b8320d1a2a1feb47e9137f9e35335e52f4d6a772de6cb43c98deb79f23c8555b",
+        "lastblockhash" : "0xbc40563707b4c2a00aa1efb97e603cfb9d2365b40338f5863f842969206e0492",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcallcallcode_001_OOGMAfter_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "7521b23f77557a8d87ff5e0f694c84c5dc182a58ebd84470296fe319ed6fbfec",
-                    "mixHash" : "883d44a9acf695fe9aac8aff6c2d736395bad62e570580e65644986d1cc336fe",
-                    "nonce" : "58b1234bb77c0fb4",
+                    "hash" : "0xf4b5c8d7866aee182d6d297604661b90f154b1ce4c7e18f61ffc852a503ff67e",
+                    "mixHash" : "0xcab827e4f9eb02de7dd20d2d01c32624e42d6caf1815ba75ab4b723a5a218f22",
+                    "nonce" : "0x00be4e2c3c392e06",
                     "number" : "0x01",
-                    "parentHash" : "98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
-                    "receiptTrie" : "5d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7",
-                    "stateRoot" : "dc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3",
+                    "parentHash" : "0x98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
+                    "receiptTrie" : "0x5d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7",
+                    "stateRoot" : "0xdc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a098f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0883d44a9acf695fe9aac8aff6c2d736395bad62e570580e65644986d1cc336fe8858b1234bb77c0fb4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a098f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0cab827e4f9eb02de7dd20d2d01c32624e42d6caf1815ba75ab4b723a5a218f228800be4e2c3c392e06f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7521b23f77557a8d87ff5e0f694c84c5dc182a58ebd84470296fe319ed6fbfec",
+        "lastblockhash" : "0xf4b5c8d7866aee182d6d297604661b90f154b1ce4c7e18f61ffc852a503ff67e",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcallcallcode_001_OOGMAfter_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "3cc02f3c42e32ff8c2a168a73db386dc1c7bb1695bba76e85aeff5c22c0d9e22",
-                    "mixHash" : "8a9ff5c0d66dd502542f903a46f4f270866e86ab33d93aaf59d8aa8dbab51ce6",
-                    "nonce" : "b4f09120fd02d529",
+                    "hash" : "0x2f553f9278989337e166f2a9a17dcb98cce50c3864218402ec982d77283e5988",
+                    "mixHash" : "0x448f01d2117f0bceabd27a0911541e6aa5157a17a8ef9b3560f81d53b0b04b03",
+                    "nonce" : "0x26ff242a331b168c",
                     "number" : "0x01",
-                    "parentHash" : "98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
-                    "receiptTrie" : "5d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7",
-                    "stateRoot" : "dc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3",
+                    "parentHash" : "0x98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
+                    "receiptTrie" : "0x5d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7",
+                    "stateRoot" : "0xdc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a098f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a08a9ff5c0d66dd502542f903a46f4f270866e86ab33d93aaf59d8aa8dbab51ce688b4f09120fd02d529f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a098f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0448f01d2117f0bceabd27a0911541e6aa5157a17a8ef9b3560f81d53b0b04b038826ff242a331b168cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3cc02f3c42e32ff8c2a168a73db386dc1c7bb1695bba76e85aeff5c22c0d9e22",
+        "lastblockhash" : "0x2f553f9278989337e166f2a9a17dcb98cce50c3864218402ec982d77283e5988",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x06ce510ea9f6b1b3ce80deda3e2f81ba8a49b02436a2cda6415948c4eb3bbbd1",
+                    "mixHash" : "0x37b458ecf4ec1fa26c7a8a86ce588f49b65519a867de3b214e5fbd894bc19acc",
+                    "nonce" : "0xd03ebc545f7caade",
+                    "number" : "0x01",
+                    "parentHash" : "0x98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0x51efc20ea24496e2c1b1dfb533701ece21a5ec3278113c62fa08bd3b6d462c0c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a098f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051efc20ea24496e2c1b1dfb533701ece21a5ec3278113c62fa08bd3b6d462c0ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a037b458ecf4ec1fa26c7a8a86ce588f49b65519a867de3b214e5fbd894bc19acc88d03ebc545f7caadef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0x06ce510ea9f6b1b3ce80deda3e2f81ba8a49b02436a2cda6415948c4eb3bbbd1",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore_d0g0v0.json
index 2c0bcb799..71a88b922 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcallcode_001_OOGMBefore_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "1029141da246ddf5f99e2180d26aa94d02d77baf31a0a445f01299e9fc56fbdf",
-                    "mixHash" : "6c88d9e3f5bef83dd45b53d7a99055628cac50c3ba8df343a072096d440a67d8",
-                    "nonce" : "0f97fe39be765a19",
+                    "hash" : "0xd75518a0f1d4c91dc33d2f9a639c1a1d4b9c5ffbb2fd080478d93cd87cba6639",
+                    "mixHash" : "0x0744ebb9a96c706105689b9766cd0b9563c14c5fd9e318dc208cfebb7a281aed",
+                    "nonce" : "0x54ba9fcd6bde6347",
                     "number" : "0x01",
-                    "parentHash" : "25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
-                    "receiptTrie" : "b57b5191c12efc12acf8270a3f0b679841a58faf644f08f165a3507c89037b5e",
-                    "stateRoot" : "d0a4b037025c0fda66a2a48075794386b1b070fc6e7a9facb632c1bba40a098c",
+                    "parentHash" : "0x25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
+                    "receiptTrie" : "0xb57b5191c12efc12acf8270a3f0b679841a58faf644f08f165a3507c89037b5e",
+                    "stateRoot" : "0xd0a4b037025c0fda66a2a48075794386b1b070fc6e7a9facb632c1bba40a098c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a025e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0a4b037025c0fda66a2a48075794386b1b070fc6e7a9facb632c1bba40a098ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b57b5191c12efc12acf8270a3f0b679841a58faf644f08f165a3507c89037b5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a06c88d9e3f5bef83dd45b53d7a99055628cac50c3ba8df343a072096d440a67d8880f97fe39be765a19f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a025e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0a4b037025c0fda66a2a48075794386b1b070fc6e7a9facb632c1bba40a098ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b57b5191c12efc12acf8270a3f0b679841a58faf644f08f165a3507c89037b5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a00744ebb9a96c706105689b9766cd0b9563c14c5fd9e318dc208cfebb7a281aed8854ba9fcd6bde6347f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a2216df0d7a95dc0206f0ac16149468d41d661d8db8b7d2207a40b6399642f6f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa2216df0d7a95dc0206f0ac16149468d41d661d8db8b7d2207a40b6399642f6f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a2216df0d7a95dc0206f0ac16149468d41d661d8db8b7d2207a40b6399642f6fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "1029141da246ddf5f99e2180d26aa94d02d77baf31a0a445f01299e9fc56fbdf",
+        "lastblockhash" : "0xd75518a0f1d4c91dc33d2f9a639c1a1d4b9c5ffbb2fd080478d93cd87cba6639",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa0c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcallcallcode_001_OOGMBefore_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "e104726395babfece048eb35939c915e70e2aa3e07119d193e850dbe2384f523",
-                    "mixHash" : "357edb033eced478c24fff3abaffa9f471cf12f7bcd0ea710d127b969ac16c01",
-                    "nonce" : "59fe3e05b8b7394a",
+                    "hash" : "0xa544ca9af3c5199821cf5ad749ab0e6adbe2dfcd66307611b71634a4f7df2ba6",
+                    "mixHash" : "0x3fe7b7743dd7b3e8e11d3861caf04bc8590114e730493c6f805aa1bb572ff178",
+                    "nonce" : "0xf29b3b1a46a331a6",
                     "number" : "0x01",
-                    "parentHash" : "25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
-                    "receiptTrie" : "b57b5191c12efc12acf8270a3f0b679841a58faf644f08f165a3507c89037b5e",
-                    "stateRoot" : "d0a4b037025c0fda66a2a48075794386b1b070fc6e7a9facb632c1bba40a098c",
+                    "parentHash" : "0x25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
+                    "receiptTrie" : "0xb57b5191c12efc12acf8270a3f0b679841a58faf644f08f165a3507c89037b5e",
+                    "stateRoot" : "0xd0a4b037025c0fda66a2a48075794386b1b070fc6e7a9facb632c1bba40a098c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a025e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0a4b037025c0fda66a2a48075794386b1b070fc6e7a9facb632c1bba40a098ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b57b5191c12efc12acf8270a3f0b679841a58faf644f08f165a3507c89037b5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0357edb033eced478c24fff3abaffa9f471cf12f7bcd0ea710d127b969ac16c018859fe3e05b8b7394af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a025e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0a4b037025c0fda66a2a48075794386b1b070fc6e7a9facb632c1bba40a098ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b57b5191c12efc12acf8270a3f0b679841a58faf644f08f165a3507c89037b5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a03fe7b7743dd7b3e8e11d3861caf04bc8590114e730493c6f805aa1bb572ff17888f29b3b1a46a331a6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a2216df0d7a95dc0206f0ac16149468d41d661d8db8b7d2207a40b6399642f6f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa2216df0d7a95dc0206f0ac16149468d41d661d8db8b7d2207a40b6399642f6f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a2216df0d7a95dc0206f0ac16149468d41d661d8db8b7d2207a40b6399642f6fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e104726395babfece048eb35939c915e70e2aa3e07119d193e850dbe2384f523",
+        "lastblockhash" : "0xa544ca9af3c5199821cf5ad749ab0e6adbe2dfcd66307611b71634a4f7df2ba6",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa0c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcallcallcode_001_OOGMBefore_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "17bcccf2cf37bcf0388e0dd8e9639f63c812269013299a3c3aa4263cdba7646c",
-                    "mixHash" : "e8a5f2b4265a7a023305f61915c8eab2ea3ed5aeee1e39e28f535e0d4d6d8494",
-                    "nonce" : "8a88bc421947e30f",
+                    "hash" : "0xeb8be7e0969de49cb7f26c6e6d09739ad7384b0e08f31c4b0bcc96879a99ed9d",
+                    "mixHash" : "0xb356a86b4d63bff67ed1d2eed78218ae6a0387cb352aeb8ed53686f0876f40f7",
+                    "nonce" : "0x0bd64c92e59605e9",
                     "number" : "0x01",
-                    "parentHash" : "25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
-                    "receiptTrie" : "49b26792a5dbba93596b68afcfaf2d597cccd379b5f4f997cfffb931123ac20c",
-                    "stateRoot" : "e3ef66f142b000c0fcf6488b423854d3f5ff326509941cddb6b29de7fa726142",
+                    "parentHash" : "0x25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
+                    "receiptTrie" : "0x49b26792a5dbba93596b68afcfaf2d597cccd379b5f4f997cfffb931123ac20c",
+                    "stateRoot" : "0xe3ef66f142b000c0fcf6488b423854d3f5ff326509941cddb6b29de7fa726142",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a025e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3ef66f142b000c0fcf6488b423854d3f5ff326509941cddb6b29de7fa726142a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea049b26792a5dbba93596b68afcfaf2d597cccd379b5f4f997cfffb931123ac20cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0e8a5f2b4265a7a023305f61915c8eab2ea3ed5aeee1e39e28f535e0d4d6d8494888a88bc421947e30ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a025e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3ef66f142b000c0fcf6488b423854d3f5ff326509941cddb6b29de7fa726142a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea049b26792a5dbba93596b68afcfaf2d597cccd379b5f4f997cfffb931123ac20cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0b356a86b4d63bff67ed1d2eed78218ae6a0387cb352aeb8ed53686f0876f40f7880bd64c92e59605e9f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,28 +340,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a2216df0d7a95dc0206f0ac16149468d41d661d8db8b7d2207a40b6399642f6f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa2216df0d7a95dc0206f0ac16149468d41d661d8db8b7d2207a40b6399642f6f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a2216df0d7a95dc0206f0ac16149468d41d661d8db8b7d2207a40b6399642f6fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "17bcccf2cf37bcf0388e0dd8e9639f63c812269013299a3c3aa4263cdba7646c",
+        "lastblockhash" : "0xeb8be7e0969de49cb7f26c6e6d09739ad7384b0e08f31c4b0bcc96879a99ed9d",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -354,74 +369,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -429,36 +444,41 @@
         }
     },
     "callcallcallcode_001_OOGMBefore_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "c230d0ffde4910a9ffc071fa81de8ce4efe9a60cb472aa5bcaaa6e4715573ec8",
-                    "mixHash" : "d2f43daae408bdf6bf952032fd08833d3abddf1bcb1a4b9652d6e96cda5ae1b1",
-                    "nonce" : "c0d3b546211fba57",
+                    "hash" : "0xf52cfb13d04d30c1dbaf57c6bfc9f1c073951f0dc98620c4b64c50b364691d35",
+                    "mixHash" : "0x20e7c048eb825e2a61d0dc5d79f9f21c54b3f774743f7d54a02e249d44bde27d",
+                    "nonce" : "0xbbff41672fc22eb0",
                     "number" : "0x01",
-                    "parentHash" : "25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
-                    "receiptTrie" : "49b26792a5dbba93596b68afcfaf2d597cccd379b5f4f997cfffb931123ac20c",
-                    "stateRoot" : "e3ef66f142b000c0fcf6488b423854d3f5ff326509941cddb6b29de7fa726142",
+                    "parentHash" : "0x25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
+                    "receiptTrie" : "0x49b26792a5dbba93596b68afcfaf2d597cccd379b5f4f997cfffb931123ac20c",
+                    "stateRoot" : "0xe3ef66f142b000c0fcf6488b423854d3f5ff326509941cddb6b29de7fa726142",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a025e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3ef66f142b000c0fcf6488b423854d3f5ff326509941cddb6b29de7fa726142a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea049b26792a5dbba93596b68afcfaf2d597cccd379b5f4f997cfffb931123ac20cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0d2f43daae408bdf6bf952032fd08833d3abddf1bcb1a4b9652d6e96cda5ae1b188c0d3b546211fba57f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a025e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3ef66f142b000c0fcf6488b423854d3f5ff326509941cddb6b29de7fa726142a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea049b26792a5dbba93596b68afcfaf2d597cccd379b5f4f997cfffb931123ac20cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a020e7c048eb825e2a61d0dc5d79f9f21c54b3f774743f7d54a02e249d44bde27d88bbff41672fc22eb0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -468,28 +488,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a2216df0d7a95dc0206f0ac16149468d41d661d8db8b7d2207a40b6399642f6f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa2216df0d7a95dc0206f0ac16149468d41d661d8db8b7d2207a40b6399642f6f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a2216df0d7a95dc0206f0ac16149468d41d661d8db8b7d2207a40b6399642f6fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c230d0ffde4910a9ffc071fa81de8ce4efe9a60cb472aa5bcaaa6e4715573ec8",
+        "lastblockhash" : "0xf52cfb13d04d30c1dbaf57c6bfc9f1c073951f0dc98620c4b64c50b364691d35",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -497,74 +517,229 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xc71c1235d7d5c6bc8d8115016d91efcf0577ed312b33d285ffbd3e79d564b39b",
+                    "mixHash" : "0x29221bf01f5e7e52c8c63d613bb8ba959c3433a09a6764bc5e4c13680f73c34e",
+                    "nonce" : "0xe96d5f6ac5587574",
+                    "number" : "0x01",
+                    "parentHash" : "0x25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0xbb23527ef3e6450619277bdd081ede03452cd2a3413af20648caef7ce4459c2d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a025e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb23527ef3e6450619277bdd081ede03452cd2a3413af20648caef7ce4459c2da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a029221bf01f5e7e52c8c63d613bb8ba959c3433a09a6764bc5e4c13680f73c34e88e96d5f6ac5587574f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0xc71c1235d7d5c6bc8d8115016d91efcf0577ed312b33d285ffbd3e79d564b39b",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd_d0g0v0.json
index 5d4ee38b5..b55a22d2a 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcallcode_001_SuicideEnd_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "9857b9ef7e10135f54d3578d9b86084784fd51bd63b6c73686b142b73d7037fa",
-                    "mixHash" : "741384aecfc523aabcb619c6da0b3cbf870c41a69673ef6ba26cdeab901268bb",
-                    "nonce" : "ac57438808739a8b",
+                    "hash" : "0x278bb0fc8c54a65f2c6141628914e8abd92ae57b7cff42dc350e0a83286b07b2",
+                    "mixHash" : "0x373439c3fec5677d09d7e78dbf859ecd6a4b3fbb54700309374ed9ba65ade016",
+                    "nonce" : "0x8d1600ce14507731",
                     "number" : "0x01",
-                    "parentHash" : "f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
-                    "receiptTrie" : "c35983d8224de90fdfaa1d0e58a63e43f3c3f8773817bb85332f389f2a11a0ea",
-                    "stateRoot" : "5fccd962fd660ab402c24cacbd0a6adfc860eb72d940fa7f8ac0ab8bd69b1fe6",
+                    "parentHash" : "0xf09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
+                    "receiptTrie" : "0xc35983d8224de90fdfaa1d0e58a63e43f3c3f8773817bb85332f389f2a11a0ea",
+                    "stateRoot" : "0x5fccd962fd660ab402c24cacbd0a6adfc860eb72d940fa7f8ac0ab8bd69b1fe6",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05fccd962fd660ab402c24cacbd0a6adfc860eb72d940fa7f8ac0ab8bd69b1fe6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c35983d8224de90fdfaa1d0e58a63e43f3c3f8773817bb85332f389f2a11a0eab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0741384aecfc523aabcb619c6da0b3cbf870c41a69673ef6ba26cdeab901268bb88ac57438808739a8bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05fccd962fd660ab402c24cacbd0a6adfc860eb72d940fa7f8ac0ab8bd69b1fe6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c35983d8224de90fdfaa1d0e58a63e43f3c3f8773817bb85332f389f2a11a0eab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0373439c3fec5677d09d7e78dbf859ecd6a4b3fbb54700309374ed9ba65ade016888d1600ce14507731f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "57cf6cdde5a2670f529e5e68595a3495dbe10f07da4a0c6fcd7a6f43bfa021bc",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x57cf6cdde5a2670f529e5e68595a3495dbe10f07da4a0c6fcd7a6f43bfa021bc",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057cf6cdde5a2670f529e5e68595a3495dbe10f07da4a0c6fcd7a6f43bfa021bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9857b9ef7e10135f54d3578d9b86084784fd51bd63b6c73686b142b73d7037fa",
+        "lastblockhash" : "0x278bb0fc8c54a65f2c6141628914e8abd92ae57b7cff42dc350e0a83286b07b2",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x04a817c800",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -76,60 +81,60 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f548e7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762b719",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -137,36 +142,41 @@
         }
     },
     "callcallcallcode_001_SuicideEnd_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "0083b22cd5cfbb65c2dfbd26e414e447dccda3f203e91e5c00000c69f3abeee2",
-                    "mixHash" : "d359d42f8637d0aa9d334256e21238917a6bd1242ff9fea3f9d33070205a0be9",
-                    "nonce" : "c4502ed0ca914180",
+                    "hash" : "0xedd79f6097d406a41a9d421e175d890482b363c337262ad53c7ff46e1524529c",
+                    "mixHash" : "0xff88583bcaeb09beda875c032117913b8988a4a0353230ecb1f918195422e697",
+                    "nonce" : "0x50b798a987e8a39f",
                     "number" : "0x01",
-                    "parentHash" : "f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
-                    "receiptTrie" : "c35983d8224de90fdfaa1d0e58a63e43f3c3f8773817bb85332f389f2a11a0ea",
-                    "stateRoot" : "5fccd962fd660ab402c24cacbd0a6adfc860eb72d940fa7f8ac0ab8bd69b1fe6",
+                    "parentHash" : "0xf09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
+                    "receiptTrie" : "0xc35983d8224de90fdfaa1d0e58a63e43f3c3f8773817bb85332f389f2a11a0ea",
+                    "stateRoot" : "0x5fccd962fd660ab402c24cacbd0a6adfc860eb72d940fa7f8ac0ab8bd69b1fe6",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05fccd962fd660ab402c24cacbd0a6adfc860eb72d940fa7f8ac0ab8bd69b1fe6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c35983d8224de90fdfaa1d0e58a63e43f3c3f8773817bb85332f389f2a11a0eab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0d359d42f8637d0aa9d334256e21238917a6bd1242ff9fea3f9d33070205a0be988c4502ed0ca914180f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05fccd962fd660ab402c24cacbd0a6adfc860eb72d940fa7f8ac0ab8bd69b1fe6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c35983d8224de90fdfaa1d0e58a63e43f3c3f8773817bb85332f389f2a11a0eab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0ff88583bcaeb09beda875c032117913b8988a4a0353230ecb1f918195422e6978850b798a987e8a39ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -176,28 +186,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "57cf6cdde5a2670f529e5e68595a3495dbe10f07da4a0c6fcd7a6f43bfa021bc",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x57cf6cdde5a2670f529e5e68595a3495dbe10f07da4a0c6fcd7a6f43bfa021bc",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057cf6cdde5a2670f529e5e68595a3495dbe10f07da4a0c6fcd7a6f43bfa021bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0083b22cd5cfbb65c2dfbd26e414e447dccda3f203e91e5c00000c69f3abeee2",
+        "lastblockhash" : "0xedd79f6097d406a41a9d421e175d890482b363c337262ad53c7ff46e1524529c",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -205,7 +215,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x04a817c800",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -213,60 +223,60 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f548e7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762b719",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -274,36 +284,41 @@
         }
     },
     "callcallcallcode_001_SuicideEnd_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "c0fddf206f0352f571c9b7323c2b222e2ef659ff70f064546e768cb70d9fa8c4",
-                    "mixHash" : "d5a6608979d48033bd5c72d45bf7b84c43b85557c3c47cbaa079bd550f807ca7",
-                    "nonce" : "a79f2ceae17ef465",
+                    "hash" : "0x18a82c91d64f4c7a1d789df7309fc8b4407699a2b0c8be03b5831186936b5e24",
+                    "mixHash" : "0xff15d4ab389d753b82a0a9b50256d94d1fb7a2776de7e68d5af80905f2da3785",
+                    "nonce" : "0xeeea8396c052425c",
                     "number" : "0x01",
-                    "parentHash" : "f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
-                    "receiptTrie" : "e1ec66a79b7ac0301c094ab924ec3c654dab0f78d31d8b5b2502f9253aa0c090",
-                    "stateRoot" : "7e186e63f107c38784349545cd0f092b23a0d110a146ade75a3dc0721a909d14",
+                    "parentHash" : "0xf09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
+                    "receiptTrie" : "0xe1ec66a79b7ac0301c094ab924ec3c654dab0f78d31d8b5b2502f9253aa0c090",
+                    "stateRoot" : "0x7e186e63f107c38784349545cd0f092b23a0d110a146ade75a3dc0721a909d14",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e186e63f107c38784349545cd0f092b23a0d110a146ade75a3dc0721a909d14a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e1ec66a79b7ac0301c094ab924ec3c654dab0f78d31d8b5b2502f9253aa0c090b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0d5a6608979d48033bd5c72d45bf7b84c43b85557c3c47cbaa079bd550f807ca788a79f2ceae17ef465f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e186e63f107c38784349545cd0f092b23a0d110a146ade75a3dc0721a909d14a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e1ec66a79b7ac0301c094ab924ec3c654dab0f78d31d8b5b2502f9253aa0c090b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0ff15d4ab389d753b82a0a9b50256d94d1fb7a2776de7e68d5af80905f2da378588eeea8396c052425cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -313,28 +328,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "57cf6cdde5a2670f529e5e68595a3495dbe10f07da4a0c6fcd7a6f43bfa021bc",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x57cf6cdde5a2670f529e5e68595a3495dbe10f07da4a0c6fcd7a6f43bfa021bc",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057cf6cdde5a2670f529e5e68595a3495dbe10f07da4a0c6fcd7a6f43bfa021bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c0fddf206f0352f571c9b7323c2b222e2ef659ff70f064546e768cb70d9fa8c4",
+        "lastblockhash" : "0x18a82c91d64f4c7a1d789df7309fc8b4407699a2b0c8be03b5831186936b5e24",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -342,7 +357,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x04a817c800",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -350,60 +365,60 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52da3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762d25d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -411,36 +426,41 @@
         }
     },
     "callcallcallcode_001_SuicideEnd_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "02851c9cec96b639b1a4c6ee6d52d320d01c6ccffd9b4e7eca761e769e21fa68",
-                    "mixHash" : "85f0d38aa2a48c974faf871921302e3b369ac8b64f889e02fce41c727241a8f7",
-                    "nonce" : "3e781a9e12b70757",
+                    "hash" : "0x1843b3e2131b057d9db09a404b607490a4292df23ef54ecb4b2baa061fb50281",
+                    "mixHash" : "0xb5853fa385af63910c1cd3732fc9bd3c680b8ed4bb4473e305e0e90ac2aa5867",
+                    "nonce" : "0x17037e01fb4158cb",
                     "number" : "0x01",
-                    "parentHash" : "f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
-                    "receiptTrie" : "e1ec66a79b7ac0301c094ab924ec3c654dab0f78d31d8b5b2502f9253aa0c090",
-                    "stateRoot" : "7e186e63f107c38784349545cd0f092b23a0d110a146ade75a3dc0721a909d14",
+                    "parentHash" : "0xf09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
+                    "receiptTrie" : "0xe1ec66a79b7ac0301c094ab924ec3c654dab0f78d31d8b5b2502f9253aa0c090",
+                    "stateRoot" : "0x7e186e63f107c38784349545cd0f092b23a0d110a146ade75a3dc0721a909d14",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e186e63f107c38784349545cd0f092b23a0d110a146ade75a3dc0721a909d14a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e1ec66a79b7ac0301c094ab924ec3c654dab0f78d31d8b5b2502f9253aa0c090b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a085f0d38aa2a48c974faf871921302e3b369ac8b64f889e02fce41c727241a8f7883e781a9e12b70757f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e186e63f107c38784349545cd0f092b23a0d110a146ade75a3dc0721a909d14a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e1ec66a79b7ac0301c094ab924ec3c654dab0f78d31d8b5b2502f9253aa0c090b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0b5853fa385af63910c1cd3732fc9bd3c680b8ed4bb4473e305e0e90ac2aa58678817037e01fb4158cbf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -450,28 +470,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "57cf6cdde5a2670f529e5e68595a3495dbe10f07da4a0c6fcd7a6f43bfa021bc",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x57cf6cdde5a2670f529e5e68595a3495dbe10f07da4a0c6fcd7a6f43bfa021bc",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057cf6cdde5a2670f529e5e68595a3495dbe10f07da4a0c6fcd7a6f43bfa021bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "02851c9cec96b639b1a4c6ee6d52d320d01c6ccffd9b4e7eca761e769e21fa68",
+        "lastblockhash" : "0x1843b3e2131b057d9db09a404b607490a4292df23ef54ecb4b2baa061fb50281",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -479,7 +499,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x04a817c800",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -487,60 +507,209 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52da3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762d25d",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x314e4dbfca00f3e2306db93efe756ac607d60903bc00753c9503615ff700d5f9",
+                    "mixHash" : "0xe7d575b3524ef6dab05837feede9a2c6ab7b6818c34bcbaa6eae85bac8882976",
+                    "nonce" : "0x005c0e799b52d9ea",
+                    "number" : "0x01",
+                    "parentHash" : "0xf09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0x6dbe810413e26dd667c3b2201beafe0b20d8b124016882a2272c4304e73f584c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06dbe810413e26dd667c3b2201beafe0b20d8b124016882a2272c4304e73f584ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0e7d575b3524ef6dab05837feede9a2c6ab7b6818c34bcbaa6eae85bac888297688005c0e799b52d9eaf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x314e4dbfca00f3e2306db93efe756ac607d60903bc00753c9503615ff700d5f9",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle_d0g0v0.json
index e5df7b45c..3043253c7 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcallcode_001_SuicideMiddle_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "b72f4438dd3947a14d37c2f6f1e71f44114c0229610a24bb4a017f393895afa7",
-                    "mixHash" : "2190b177e0cef44b14b0f9497eac0a74e377a442f4777fca916b15bbff05e224",
-                    "nonce" : "c2e77ce13ee34dac",
+                    "hash" : "0x5bb7a70988b4528976ffcce42b9f1047e26b548c4ee134922b58b41588e598d0",
+                    "mixHash" : "0x9877c365da246c3fa6789c1a91e6dec0c2aec1b12bbfd3704cb6c283085fbd6c",
+                    "nonce" : "0x8b050ef7cd797d70",
                     "number" : "0x01",
-                    "parentHash" : "90a5ae5be2b5e11f5ec1770d29701fc1448dfdfc064bef8de5d6aca39666338c",
-                    "receiptTrie" : "f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1",
-                    "stateRoot" : "ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07",
+                    "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+                    "receiptTrie" : "0xf5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1",
+                    "stateRoot" : "0xef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a090a5ae5be2b5e11f5ec1770d29701fc1448dfdfc064bef8de5d6aca39666338ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a02190b177e0cef44b14b0f9497eac0a74e377a442f4777fca916b15bbff05e22488c2e77ce13ee34dacf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a09877c365da246c3fa6789c1a91e6dec0c2aec1b12bbfd3704cb6c283085fbd6c888b050ef7cd797d70f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "90a5ae5be2b5e11f5ec1770d29701fc1448dfdfc064bef8de5d6aca39666338c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9abb9cfc118cb29c32e2ffe1f8fe2aafa98747e7c867f156e3aa9d01ad8e9729",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09abb9cfc118cb29c32e2ffe1f8fe2aafa98747e7c867f156e3aa9d01ad8e9729a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b72f4438dd3947a14d37c2f6f1e71f44114c0229610a24bb4a017f393895afa7",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5bb7a70988b4528976ffcce42b9f1047e26b548c4ee134922b58b41588e598d0",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -76,60 +81,60 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4a9c7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7635639",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -137,36 +142,41 @@
         }
     },
     "callcallcallcode_001_SuicideMiddle_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "4365a9367bb2af6defcec15a830df0ff644c59a9f2bc904cd6d664ede1d8138b",
-                    "mixHash" : "b8ceb3715ae92bd1ebbcb11ca6da2ef83a5a6744774468b8fedd9a0a41c06599",
-                    "nonce" : "8b34163311775a4b",
+                    "hash" : "0xf022afc008f6447f023b9ebef7fe8c88d080f1ba4031dcb3e9e5a0a1e0372010",
+                    "mixHash" : "0x0e046bcd6c9559a963ce47ef3ff90a8497ab4cf93448df4d2ed84b6e1e3c796d",
+                    "nonce" : "0x269cfacca7a0ec66",
                     "number" : "0x01",
-                    "parentHash" : "90a5ae5be2b5e11f5ec1770d29701fc1448dfdfc064bef8de5d6aca39666338c",
-                    "receiptTrie" : "f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1",
-                    "stateRoot" : "ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07",
+                    "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+                    "receiptTrie" : "0xf5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1",
+                    "stateRoot" : "0xef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a090a5ae5be2b5e11f5ec1770d29701fc1448dfdfc064bef8de5d6aca39666338ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0b8ceb3715ae92bd1ebbcb11ca6da2ef83a5a6744774468b8fedd9a0a41c06599888b34163311775a4bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a00e046bcd6c9559a963ce47ef3ff90a8497ab4cf93448df4d2ed84b6e1e3c796d88269cfacca7a0ec66f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -176,28 +186,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "90a5ae5be2b5e11f5ec1770d29701fc1448dfdfc064bef8de5d6aca39666338c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9abb9cfc118cb29c32e2ffe1f8fe2aafa98747e7c867f156e3aa9d01ad8e9729",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09abb9cfc118cb29c32e2ffe1f8fe2aafa98747e7c867f156e3aa9d01ad8e9729a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4365a9367bb2af6defcec15a830df0ff644c59a9f2bc904cd6d664ede1d8138b",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf022afc008f6447f023b9ebef7fe8c88d080f1ba4031dcb3e9e5a0a1e0372010",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -205,7 +215,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -213,60 +223,60 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4a9c7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7635639",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -274,36 +284,41 @@
         }
     },
     "callcallcallcode_001_SuicideMiddle_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9117",
-                    "hash" : "143f35bbadac7668d88b500246683219da7071a99009d25e9806e719342e650e",
-                    "mixHash" : "8ad4c4c0cf5202e1d2626252a8c9f5b954c3cd1fc7e06b58e3f3e34ac27e3105",
-                    "nonce" : "15d009bacea1f391",
+                    "hash" : "0xf0446419293c41107750a5c0e837d0e62db084196ccfb85990c82d2bfb0ac189",
+                    "mixHash" : "0x49c6065ba2e8b9b8d546a43fc5e5fe05bb213f9d58d61f8128181467d4d1b2d3",
+                    "nonce" : "0x1fe00349687bdb37",
                     "number" : "0x01",
-                    "parentHash" : "90a5ae5be2b5e11f5ec1770d29701fc1448dfdfc064bef8de5d6aca39666338c",
-                    "receiptTrie" : "1c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698a",
-                    "stateRoot" : "488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abf",
+                    "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+                    "receiptTrie" : "0x1c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698a",
+                    "stateRoot" : "0x488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abf",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a090a5ae5be2b5e11f5ec1770d29701fc1448dfdfc064bef8de5d6aca39666338ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a08ad4c4c0cf5202e1d2626252a8c9f5b954c3cd1fc7e06b58e3f3e34ac27e31058815d009bacea1f391f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a049c6065ba2e8b9b8d546a43fc5e5fe05bb213f9d58d61f8128181467d4d1b2d3881fe00349687bdb37f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -313,28 +328,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "90a5ae5be2b5e11f5ec1770d29701fc1448dfdfc064bef8de5d6aca39666338c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9abb9cfc118cb29c32e2ffe1f8fe2aafa98747e7c867f156e3aa9d01ad8e9729",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09abb9cfc118cb29c32e2ffe1f8fe2aafa98747e7c867f156e3aa9d01ad8e9729a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "143f35bbadac7668d88b500246683219da7071a99009d25e9806e719342e650e",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf0446419293c41107750a5c0e837d0e62db084196ccfb85990c82d2bfb0ac189",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -342,7 +357,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -350,60 +365,60 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f49117",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7636ee9",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -411,36 +426,41 @@
         }
     },
     "callcallcallcode_001_SuicideMiddle_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9117",
-                    "hash" : "0886cbfb58f03336ce86f9bbd43edbe21945a543d2a85682669cfd832a5e1566",
-                    "mixHash" : "0ba4df2d1ef63b72b96e5a147efc0af2b7ed2e2c95b92125df8fe1cafc3484b1",
-                    "nonce" : "953b0e57dcfa3158",
+                    "hash" : "0xc80d3853c55c9e353fe7011359c15af23f94e1957585d44223f813ed4bb82e6d",
+                    "mixHash" : "0x528c2b7382fc03ed6617e1b9993d539ac5be41aec91ca342df14605957b86e6d",
+                    "nonce" : "0x964fb47df2cf3e52",
                     "number" : "0x01",
-                    "parentHash" : "90a5ae5be2b5e11f5ec1770d29701fc1448dfdfc064bef8de5d6aca39666338c",
-                    "receiptTrie" : "1c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698a",
-                    "stateRoot" : "488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abf",
+                    "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+                    "receiptTrie" : "0x1c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698a",
+                    "stateRoot" : "0x488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abf",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a090a5ae5be2b5e11f5ec1770d29701fc1448dfdfc064bef8de5d6aca39666338ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a00ba4df2d1ef63b72b96e5a147efc0af2b7ed2e2c95b92125df8fe1cafc3484b188953b0e57dcfa3158f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0528c2b7382fc03ed6617e1b9993d539ac5be41aec91ca342df14605957b86e6d88964fb47df2cf3e52f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -450,28 +470,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "90a5ae5be2b5e11f5ec1770d29701fc1448dfdfc064bef8de5d6aca39666338c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9abb9cfc118cb29c32e2ffe1f8fe2aafa98747e7c867f156e3aa9d01ad8e9729",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09abb9cfc118cb29c32e2ffe1f8fe2aafa98747e7c867f156e3aa9d01ad8e9729a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0886cbfb58f03336ce86f9bbd43edbe21945a543d2a85682669cfd832a5e1566",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc80d3853c55c9e353fe7011359c15af23f94e1957585d44223f813ed4bb82e6d",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -479,7 +499,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -487,60 +507,209 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f49117",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7636ee9",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x738c3b0e8a64e646e1abfaa238a296c00ce4818dfd73d5601c7452b0036f525a",
+                    "mixHash" : "0xbfc68f5ef625fd40437d014e1544feddef1db853f1fed510bcfda15a60fd9ca7",
+                    "nonce" : "0x6cc3df9b4a659eed",
+                    "number" : "0x01",
+                    "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x4c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0bfc68f5ef625fd40437d014e1544feddef1db853f1fed510bcfda15a60fd9ca7886cc3df9b4a659eedf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x738c3b0e8a64e646e1abfaa238a296c00ce4818dfd73d5601c7452b0036f525a",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_d0g0v0.json
index a3897bc98..09b0d978b 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcallcode_001_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "8bb728aa05215129a4f9ed48f1d4fa6ff29490e71e5166e3f285f82ecbdd7bc9",
-                    "mixHash" : "f30433fc34c204285f01187ac2b729edb093cfce0dc06216fd773dd4d8125f03",
-                    "nonce" : "e753f32bdba816bb",
+                    "hash" : "0xb3a78713c5a256dd25f0cb4ac5efac20a62ef72a8cfa2ea6e258fcc59562a98a",
+                    "mixHash" : "0x11041d925961b3f9cd11d19a1a5ad538b9f3bd54476a3fa7e7b83019ce9b9875",
+                    "nonce" : "0x96ddd8ef0abe3dcf",
                     "number" : "0x01",
-                    "parentHash" : "f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
-                    "receiptTrie" : "68c3cab12c4a6a124ddaed041f2619eeed7b5f61302c6a940e53553957f0fd2e",
-                    "stateRoot" : "bc3f1bafaa4e50a4eb489a2244918d665cf0d7867602b2c2aac65519ff277280",
+                    "parentHash" : "0xf9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
+                    "receiptTrie" : "0x68c3cab12c4a6a124ddaed041f2619eeed7b5f61302c6a940e53553957f0fd2e",
+                    "stateRoot" : "0xbc3f1bafaa4e50a4eb489a2244918d665cf0d7867602b2c2aac65519ff277280",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc3f1bafaa4e50a4eb489a2244918d665cf0d7867602b2c2aac65519ff277280a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a068c3cab12c4a6a124ddaed041f2619eeed7b5f61302c6a940e53553957f0fd2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0f30433fc34c204285f01187ac2b729edb093cfce0dc06216fd773dd4d8125f0388e753f32bdba816bbf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc3f1bafaa4e50a4eb489a2244918d665cf0d7867602b2c2aac65519ff277280a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a068c3cab12c4a6a124ddaed041f2619eeed7b5f61302c6a940e53553957f0fd2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a011041d925961b3f9cd11d19a1a5ad538b9f3bd54476a3fa7e7b83019ce9b98758896ddd8ef0abe3dcff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "61bb4e4d92e93495e5d39a87e053d191fca7be6581de5e4a69ab5171396f39ac",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x61bb4e4d92e93495e5d39a87e053d191fca7be6581de5e4a69ab5171396f39ac",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061bb4e4d92e93495e5d39a87e053d191fca7be6581de5e4a69ab5171396f39aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8bb728aa05215129a4f9ed48f1d4fa6ff29490e71e5166e3f285f82ecbdd7bc9",
+        "lastblockhash" : "0xb3a78713c5a256dd25f0cb4ac5efac20a62ef72a8cfa2ea6e258fcc59562a98a",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
@@ -76,7 +81,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640002",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
@@ -92,60 +97,60 @@
                     "0x07" : "0x03"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f804a3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ffb5d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -153,36 +158,41 @@
         }
     },
     "callcallcallcode_001_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "c5454261c60e097863962fc3deefb4a62056878c028372854b131b1b28ab23df",
-                    "mixHash" : "3087fe91540a48d850a0da780568cbd8a4f0edf2d4b19c65b24c85685f754d77",
-                    "nonce" : "8bdf6f7c9c92abc9",
+                    "hash" : "0xe739bfea2c197bd0e3bfab9b2ca354078759a798a22d4d0ac7988144fff6e2b6",
+                    "mixHash" : "0x7c441676399ec411a76013542e230f5f73ff2482d60e9958616376c78ee6fdcb",
+                    "nonce" : "0x283f3e82b6434a36",
                     "number" : "0x01",
-                    "parentHash" : "f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
-                    "receiptTrie" : "68c3cab12c4a6a124ddaed041f2619eeed7b5f61302c6a940e53553957f0fd2e",
-                    "stateRoot" : "bc3f1bafaa4e50a4eb489a2244918d665cf0d7867602b2c2aac65519ff277280",
+                    "parentHash" : "0xf9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
+                    "receiptTrie" : "0x68c3cab12c4a6a124ddaed041f2619eeed7b5f61302c6a940e53553957f0fd2e",
+                    "stateRoot" : "0xbc3f1bafaa4e50a4eb489a2244918d665cf0d7867602b2c2aac65519ff277280",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc3f1bafaa4e50a4eb489a2244918d665cf0d7867602b2c2aac65519ff277280a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a068c3cab12c4a6a124ddaed041f2619eeed7b5f61302c6a940e53553957f0fd2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a03087fe91540a48d850a0da780568cbd8a4f0edf2d4b19c65b24c85685f754d77888bdf6f7c9c92abc9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc3f1bafaa4e50a4eb489a2244918d665cf0d7867602b2c2aac65519ff277280a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a068c3cab12c4a6a124ddaed041f2619eeed7b5f61302c6a940e53553957f0fd2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a07c441676399ec411a76013542e230f5f73ff2482d60e9958616376c78ee6fdcb88283f3e82b6434a36f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -192,28 +202,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "61bb4e4d92e93495e5d39a87e053d191fca7be6581de5e4a69ab5171396f39ac",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x61bb4e4d92e93495e5d39a87e053d191fca7be6581de5e4a69ab5171396f39ac",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061bb4e4d92e93495e5d39a87e053d191fca7be6581de5e4a69ab5171396f39aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c5454261c60e097863962fc3deefb4a62056878c028372854b131b1b28ab23df",
+        "lastblockhash" : "0xe739bfea2c197bd0e3bfab9b2ca354078759a798a22d4d0ac7988144fff6e2b6",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -221,7 +231,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
@@ -229,7 +239,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640002",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
@@ -245,60 +255,60 @@
                     "0x07" : "0x03"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f804a3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ffb5d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -306,36 +316,41 @@
         }
     },
     "callcallcallcode_001_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "29e939a8240ea6cb375dcae59179e642c7adeb80981cb38f252c531d690356c2",
-                    "mixHash" : "cc0faf656ee8c966427d361999d783ace5e399799cb0c023d3da5202ce2b4488",
-                    "nonce" : "b203c3d269d9cf77",
+                    "hash" : "0x237a36c974c08c645915c0f913eb5bca3b9bd44a2a3ac2363b966caf75ec0f5a",
+                    "mixHash" : "0x3b7d2ec0d2ee73009fe3574ea070eed1566e05847e23bd02f254bb993fc00ff7",
+                    "nonce" : "0x89f8879c09a0d3a4",
                     "number" : "0x01",
-                    "parentHash" : "f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
-                    "receiptTrie" : "3c775436b220dca4da14ea054c840cfd7088e61e639919c3d108360c4a3a044f",
-                    "stateRoot" : "630b0621c39587b25aaa35019c0cf62e6f64f966f1d022b2cb5ce464426f0db5",
+                    "parentHash" : "0xf9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
+                    "receiptTrie" : "0x3c775436b220dca4da14ea054c840cfd7088e61e639919c3d108360c4a3a044f",
+                    "stateRoot" : "0x630b0621c39587b25aaa35019c0cf62e6f64f966f1d022b2cb5ce464426f0db5",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0630b0621c39587b25aaa35019c0cf62e6f64f966f1d022b2cb5ce464426f0db5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03c775436b220dca4da14ea054c840cfd7088e61e639919c3d108360c4a3a044fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0cc0faf656ee8c966427d361999d783ace5e399799cb0c023d3da5202ce2b448888b203c3d269d9cf77f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0630b0621c39587b25aaa35019c0cf62e6f64f966f1d022b2cb5ce464426f0db5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03c775436b220dca4da14ea054c840cfd7088e61e639919c3d108360c4a3a044fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a03b7d2ec0d2ee73009fe3574ea070eed1566e05847e23bd02f254bb993fc00ff78889f8879c09a0d3a4f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -345,28 +360,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "61bb4e4d92e93495e5d39a87e053d191fca7be6581de5e4a69ab5171396f39ac",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x61bb4e4d92e93495e5d39a87e053d191fca7be6581de5e4a69ab5171396f39ac",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061bb4e4d92e93495e5d39a87e053d191fca7be6581de5e4a69ab5171396f39aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "29e939a8240ea6cb375dcae59179e642c7adeb80981cb38f252c531d690356c2",
+        "lastblockhash" : "0x237a36c974c08c645915c0f913eb5bca3b9bd44a2a3ac2363b966caf75ec0f5a",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -374,7 +389,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
@@ -382,7 +397,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640002",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
@@ -398,60 +413,60 @@
                     "0x07" : "0x03"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7fce7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7600319",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -459,36 +474,41 @@
         }
     },
     "callcallcallcode_001_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "f450aeddf47c2d76a2be69468f54352b43e92d58d69573967ebcded3c3921ab8",
-                    "mixHash" : "22ff81778c89da33cacb5a61e52c1db6dc827f311100ea97bc8f0291447ec957",
-                    "nonce" : "a95c4c35132110e6",
+                    "hash" : "0xbab7170d74919fa8c81e9e18fe416fc23f666895acb961cb90d8dc62300209bd",
+                    "mixHash" : "0x69ac7b0a88741fdb39cceeaed21e473b3f0171556a802cb716c1cb6cecc131d7",
+                    "nonce" : "0x2cfb8cddc86bfab3",
                     "number" : "0x01",
-                    "parentHash" : "f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
-                    "receiptTrie" : "3c775436b220dca4da14ea054c840cfd7088e61e639919c3d108360c4a3a044f",
-                    "stateRoot" : "630b0621c39587b25aaa35019c0cf62e6f64f966f1d022b2cb5ce464426f0db5",
+                    "parentHash" : "0xf9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
+                    "receiptTrie" : "0x3c775436b220dca4da14ea054c840cfd7088e61e639919c3d108360c4a3a044f",
+                    "stateRoot" : "0x630b0621c39587b25aaa35019c0cf62e6f64f966f1d022b2cb5ce464426f0db5",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0630b0621c39587b25aaa35019c0cf62e6f64f966f1d022b2cb5ce464426f0db5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03c775436b220dca4da14ea054c840cfd7088e61e639919c3d108360c4a3a044fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a022ff81778c89da33cacb5a61e52c1db6dc827f311100ea97bc8f0291447ec95788a95c4c35132110e6f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0630b0621c39587b25aaa35019c0cf62e6f64f966f1d022b2cb5ce464426f0db5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03c775436b220dca4da14ea054c840cfd7088e61e639919c3d108360c4a3a044fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a069ac7b0a88741fdb39cceeaed21e473b3f0171556a802cb716c1cb6cecc131d7882cfb8cddc86bfab3f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -498,28 +518,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "61bb4e4d92e93495e5d39a87e053d191fca7be6581de5e4a69ab5171396f39ac",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x61bb4e4d92e93495e5d39a87e053d191fca7be6581de5e4a69ab5171396f39ac",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061bb4e4d92e93495e5d39a87e053d191fca7be6581de5e4a69ab5171396f39aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f450aeddf47c2d76a2be69468f54352b43e92d58d69573967ebcded3c3921ab8",
+        "lastblockhash" : "0xbab7170d74919fa8c81e9e18fe416fc23f666895acb961cb90d8dc62300209bd",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -527,7 +547,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
@@ -535,7 +555,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640002",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
@@ -551,60 +571,225 @@
                     "0x07" : "0x03"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7fce7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7600319",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0x37b555946960dcc49cad85422fe7a678dd1b95de99fdcb21777eb291c0bd2ef6",
+                    "mixHash" : "0x1702f912a530b3b18b7e87b7755b04afb4717dd337cd672be6406943ba84842f",
+                    "nonce" : "0xfb971aae3c110262",
+                    "number" : "0x01",
+                    "parentHash" : "0xf9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0x494b0317a8de477d072292a5d7c22c46b0d1c9d8918e5b1d4ea6b2de4f70980d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0494b0317a8de477d072292a5d7c22c46b0d1c9d8918e5b1d4ea6b2de4f70980da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a01702f912a530b3b18b7e87b7755b04afb4717dd337cd672be6406943ba84842f88fb971aae3c110262f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x37b555946960dcc49cad85422fe7a678dd1b95de99fdcb21777eb291c0bd2ef6",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE_d0g0v0.json
index b5d349856..55853af98 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcallcode_ABCB_RECURSIVE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "413bd524b90584d6ea9ef4a03800a8e7c90003236f42db5a8042ae9b0af5490d",
-                    "mixHash" : "2722a146969f9d354df5c5915722f4d5a9742b316d6611fd2063d8e393705a22",
-                    "nonce" : "666ddd45135066da",
+                    "hash" : "0x5593b8e9d33a30ca7027a897294ebb52be64c7fe3093802a97b23e0c9b8c09d7",
+                    "mixHash" : "0x17846a44112d029f681aaaf577fcbf0ad9a97e69451ba73c273a4f856bab2e86",
+                    "nonce" : "0x3cf4e7410be0d564",
                     "number" : "0x01",
-                    "parentHash" : "b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
-                    "receiptTrie" : "249c8967e08dd0774943225b8432817fb402de738281341e24d762d5505e2648",
-                    "stateRoot" : "f02b37a44169b0295ac16b65b469237f0603db1170ea01c091709bcdef931cb8",
+                    "parentHash" : "0xb57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
+                    "receiptTrie" : "0x249c8967e08dd0774943225b8432817fb402de738281341e24d762d5505e2648",
+                    "stateRoot" : "0xf02b37a44169b0295ac16b65b469237f0603db1170ea01c091709bcdef931cb8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f02b37a44169b0295ac16b65b469237f0603db1170ea01c091709bcdef931cb8a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0249c8967e08dd0774943225b8432817fb402de738281341e24d762d5505e2648b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a02722a146969f9d354df5c5915722f4d5a9742b316d6611fd2063d8e393705a2288666ddd45135066daf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f02b37a44169b0295ac16b65b469237f0603db1170ea01c091709bcdef931cb8a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0249c8967e08dd0774943225b8432817fb402de738281341e24d762d5505e2648b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a017846a44112d029f681aaaf577fcbf0ad9a97e69451ba73c273a4f856bab2e86883cf4e7410be0d564f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ead1739dfe9009e8f6f516e339e3b968d9235b283f7f74f3c4d96ee578ae182f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xead1739dfe9009e8f6f516e339e3b968d9235b283f7f74f3c4d96ee578ae182f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ead1739dfe9009e8f6f516e339e3b968d9235b283f7f74f3c4d96ee578ae182fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "413bd524b90584d6ea9ef4a03800a8e7c90003236f42db5a8042ae9b0af5490d",
+        "lastblockhash" : "0x5593b8e9d33a30ca7027a897294ebb52be64c7fe3093802a97b23e0c9b8c09d7",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
@@ -76,53 +81,53 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fcab7e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5482",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -130,36 +135,41 @@
         }
     },
     "callcallcallcode_ABCB_RECURSIVE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "70421d7766b681edcdb0d4c2ab8ce1c9a6f65c8abb354fdaa107b8d56a65e50b",
-                    "mixHash" : "e18012aacaad59fe31d73c73b0edb8a117e8be137ffc4800d8dc5fce138e8ecd",
-                    "nonce" : "76fd171821be8fa1",
+                    "hash" : "0x1fce5c7fcea287ff4fcc485fee0f0e98d044bc65b1d049f24dd600e5d4fc0a60",
+                    "mixHash" : "0xd44be7ac8a190261631f93408d6e54fdfb38f0f59f2a5a7b80570c8dc63e1b85",
+                    "nonce" : "0xc37df94bbf6b06a7",
                     "number" : "0x01",
-                    "parentHash" : "b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
-                    "receiptTrie" : "249c8967e08dd0774943225b8432817fb402de738281341e24d762d5505e2648",
-                    "stateRoot" : "f02b37a44169b0295ac16b65b469237f0603db1170ea01c091709bcdef931cb8",
+                    "parentHash" : "0xb57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
+                    "receiptTrie" : "0x249c8967e08dd0774943225b8432817fb402de738281341e24d762d5505e2648",
+                    "stateRoot" : "0xf02b37a44169b0295ac16b65b469237f0603db1170ea01c091709bcdef931cb8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f02b37a44169b0295ac16b65b469237f0603db1170ea01c091709bcdef931cb8a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0249c8967e08dd0774943225b8432817fb402de738281341e24d762d5505e2648b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0e18012aacaad59fe31d73c73b0edb8a117e8be137ffc4800d8dc5fce138e8ecd8876fd171821be8fa1f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f02b37a44169b0295ac16b65b469237f0603db1170ea01c091709bcdef931cb8a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0249c8967e08dd0774943225b8432817fb402de738281341e24d762d5505e2648b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0d44be7ac8a190261631f93408d6e54fdfb38f0f59f2a5a7b80570c8dc63e1b8588c37df94bbf6b06a7f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -169,28 +179,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ead1739dfe9009e8f6f516e339e3b968d9235b283f7f74f3c4d96ee578ae182f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xead1739dfe9009e8f6f516e339e3b968d9235b283f7f74f3c4d96ee578ae182f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ead1739dfe9009e8f6f516e339e3b968d9235b283f7f74f3c4d96ee578ae182fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "70421d7766b681edcdb0d4c2ab8ce1c9a6f65c8abb354fdaa107b8d56a65e50b",
+        "lastblockhash" : "0x1fce5c7fcea287ff4fcc485fee0f0e98d044bc65b1d049f24dd600e5d4fc0a60",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
@@ -198,7 +208,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
@@ -206,53 +216,53 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fcab7e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5482",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -260,36 +270,41 @@
         }
     },
     "callcallcallcode_ABCB_RECURSIVE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "3bff2ccbbf1a345c272e46ea4f8ec0d8e7995bef420063dd697f9ec726133767",
-                    "mixHash" : "9223ab054f0738131c59c6b32b3cd216fee9bd904c3faf617f1f43f9c4665fd2",
-                    "nonce" : "4942b7233deb1e1a",
+                    "hash" : "0xa44c4b60622efd54e7d8c991b1803573aab08f2eee26492163cc2b096ef7c540",
+                    "mixHash" : "0xd436ad3331f52714e6ce8e1b2bb9d041f133a93cb69d9ba26690335a3b753c66",
+                    "nonce" : "0x74bb8a7a627a9c76",
                     "number" : "0x01",
-                    "parentHash" : "b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
-                    "receiptTrie" : "681f5ac382d143b1dc072fd643ff6e17c60f0b3a3d52ea9b4eb873bb9ce68168",
-                    "stateRoot" : "0aa2296e839302d219634ad373fc5ec117341c6f7b1c2d14b0e8668e3a8e944c",
+                    "parentHash" : "0xb57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
+                    "receiptTrie" : "0x681f5ac382d143b1dc072fd643ff6e17c60f0b3a3d52ea9b4eb873bb9ce68168",
+                    "stateRoot" : "0x0aa2296e839302d219634ad373fc5ec117341c6f7b1c2d14b0e8668e3a8e944c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00aa2296e839302d219634ad373fc5ec117341c6f7b1c2d14b0e8668e3a8e944ca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0681f5ac382d143b1dc072fd643ff6e17c60f0b3a3d52ea9b4eb873bb9ce68168b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a09223ab054f0738131c59c6b32b3cd216fee9bd904c3faf617f1f43f9c4665fd2884942b7233deb1e1af863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00aa2296e839302d219634ad373fc5ec117341c6f7b1c2d14b0e8668e3a8e944ca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0681f5ac382d143b1dc072fd643ff6e17c60f0b3a3d52ea9b4eb873bb9ce68168b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0d436ad3331f52714e6ce8e1b2bb9d041f133a93cb69d9ba26690335a3b753c668874bb8a7a627a9c76f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -299,28 +314,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ead1739dfe9009e8f6f516e339e3b968d9235b283f7f74f3c4d96ee578ae182f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xead1739dfe9009e8f6f516e339e3b968d9235b283f7f74f3c4d96ee578ae182f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ead1739dfe9009e8f6f516e339e3b968d9235b283f7f74f3c4d96ee578ae182fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3bff2ccbbf1a345c272e46ea4f8ec0d8e7995bef420063dd697f9ec726133767",
+        "lastblockhash" : "0xa44c4b60622efd54e7d8c991b1803573aab08f2eee26492163cc2b096ef7c540",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
@@ -328,7 +343,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
@@ -336,53 +351,53 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fca3c2",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5c3e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -390,36 +405,41 @@
         }
     },
     "callcallcallcode_ABCB_RECURSIVE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "d5a7e35763cfdfdcfa2de36af3d97a41e23a6acfc041568c6329e0934283ddea",
-                    "mixHash" : "c290de165602f25250a3d9766036f83297933a93a27b69adb469877315f88b92",
-                    "nonce" : "3edb94423f394376",
+                    "hash" : "0x08faa428afa07ed087d50a7884401e0d9f78a083e5392b5ff92b51f4e6a3cf13",
+                    "mixHash" : "0x8eecbdd70d05c953a43d64bb1532eb267c5acb68e8ab9458f36a4e78fde31c75",
+                    "nonce" : "0x5466bbc0cf021702",
                     "number" : "0x01",
-                    "parentHash" : "b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
-                    "receiptTrie" : "681f5ac382d143b1dc072fd643ff6e17c60f0b3a3d52ea9b4eb873bb9ce68168",
-                    "stateRoot" : "0aa2296e839302d219634ad373fc5ec117341c6f7b1c2d14b0e8668e3a8e944c",
+                    "parentHash" : "0xb57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
+                    "receiptTrie" : "0x681f5ac382d143b1dc072fd643ff6e17c60f0b3a3d52ea9b4eb873bb9ce68168",
+                    "stateRoot" : "0x0aa2296e839302d219634ad373fc5ec117341c6f7b1c2d14b0e8668e3a8e944c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00aa2296e839302d219634ad373fc5ec117341c6f7b1c2d14b0e8668e3a8e944ca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0681f5ac382d143b1dc072fd643ff6e17c60f0b3a3d52ea9b4eb873bb9ce68168b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0c290de165602f25250a3d9766036f83297933a93a27b69adb469877315f88b92883edb94423f394376f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00aa2296e839302d219634ad373fc5ec117341c6f7b1c2d14b0e8668e3a8e944ca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0681f5ac382d143b1dc072fd643ff6e17c60f0b3a3d52ea9b4eb873bb9ce68168b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a08eecbdd70d05c953a43d64bb1532eb267c5acb68e8ab9458f36a4e78fde31c75885466bbc0cf021702f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -429,28 +449,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ead1739dfe9009e8f6f516e339e3b968d9235b283f7f74f3c4d96ee578ae182f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xead1739dfe9009e8f6f516e339e3b968d9235b283f7f74f3c4d96ee578ae182f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ead1739dfe9009e8f6f516e339e3b968d9235b283f7f74f3c4d96ee578ae182fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d5a7e35763cfdfdcfa2de36af3d97a41e23a6acfc041568c6329e0934283ddea",
+        "lastblockhash" : "0x08faa428afa07ed087d50a7884401e0d9f78a083e5392b5ff92b51f4e6a3cf13",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
@@ -458,7 +478,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
@@ -466,53 +486,195 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fca3c2",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5c3e",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x7ebd96cb5ab32a2ddc45092f7089c52f61231121d420e0f4ccc01259a1e6a31b",
+                    "mixHash" : "0x14b407e57d974023243b5cf284eca70cf4d399b495c39359028b23e359bb3cf4",
+                    "nonce" : "0x1b0ea9630b3f9b1f",
+                    "number" : "0x01",
+                    "parentHash" : "0xb57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0x9185a886996d59c60175cb8123ab49b1c9183a897fc24b835ada5ec49c78b348",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09185a886996d59c60175cb8123ab49b1c9183a897fc24b835ada5ec49c78b348a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a014b407e57d974023243b5cf284eca70cf4d399b495c39359028b23e359bb3cf4881b0ea9630b3f9b1ff863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "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" : "0x7ebd96cb5ab32a2ddc45092f7089c52f61231121d420e0f4ccc01259a1e6a31b",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_OOGE.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_OOGE_d0g0v0.json
index d5526a99d..1d8f4a973 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_OOGE.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_OOGE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcode_01_OOGE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcode_01_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010798",
-                    "hash" : "f4ee13f7367105a86dbb04f7dbe61ff942ca66a342a64d412cfe7c964d50b29b",
-                    "mixHash" : "4e5b607a728063330a27b520bada826a56979c3c7fe3a5cbd1dbda70b4fa41b4",
-                    "nonce" : "c9407bfcf1caa0c9",
+                    "hash" : "0x28e165c3bff953926a87810b94ad35d9d1ed113ca37e789ed6bbd732d98ea5a4",
+                    "mixHash" : "0x454d004c81159bc6af09642455964f86825320bb46de0d776bc4b8c530d52c9a",
+                    "nonce" : "0xa29f736f36fd6f92",
                     "number" : "0x01",
-                    "parentHash" : "20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
-                    "receiptTrie" : "f7b5e56f5467b1b17ce5f01eaaf1b8fe2e6b7e38b5d43b143ecb982f78cb51e5",
-                    "stateRoot" : "bbf0fa12937cca40d0c22311ebdc094cbe1dc4dc3986a7bed4dd7664d85952d8",
+                    "parentHash" : "0x20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
+                    "receiptTrie" : "0xf7b5e56f5467b1b17ce5f01eaaf1b8fe2e6b7e38b5d43b143ecb982f78cb51e5",
+                    "stateRoot" : "0xbbf0fa12937cca40d0c22311ebdc094cbe1dc4dc3986a7bed4dd7664d85952d8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a020db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbf0fa12937cca40d0c22311ebdc094cbe1dc4dc3986a7bed4dd7664d85952d8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f7b5e56f5467b1b17ce5f01eaaf1b8fe2e6b7e38b5d43b143ecb982f78cb51e5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a04e5b607a728063330a27b520bada826a56979c3c7fe3a5cbd1dbda70b4fa41b488c9407bfcf1caa0c9f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a020db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbf0fa12937cca40d0c22311ebdc094cbe1dc4dc3986a7bed4dd7664d85952d8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f7b5e56f5467b1b17ce5f01eaaf1b8fe2e6b7e38b5d43b143ecb982f78cb51e5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0454d004c81159bc6af09642455964f86825320bb46de0d776bc4b8c530d52c9a88a29f736f36fd6f92f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8e9e91e6f107559d9eb9f6348ec3e2dd7a4a8f4e3bcc762d63fea069e4bc1a6e",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8e9e91e6f107559d9eb9f6348ec3e2dd7a4a8f4e3bcc762d63fea069e4bc1a6e",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08e9e91e6f107559d9eb9f6348ec3e2dd7a4a8f4e3bcc762d63fea069e4bc1a6ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f4ee13f7367105a86dbb04f7dbe61ff942ca66a342a64d412cfe7c964d50b29b",
+        "lastblockhash" : "0x28e165c3bff953926a87810b94ad35d9d1ed113ca37e789ed6bbd732d98ea5a4",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -68,60 +73,60 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f50798",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762f868",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -129,36 +134,41 @@
         }
     },
     "callcallcode_01_OOGE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcode_01_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010798",
-                    "hash" : "918274871764ecd917b5124ffa557d8303478333aaf76a24e4a88945ccf286ee",
-                    "mixHash" : "83a3ae84b444dc5e6d4e3875143d1739b8c10f51a9479e0942618ae30e0bf84b",
-                    "nonce" : "7b3de68da348f9b3",
+                    "hash" : "0xa1b7a881534c9f403e98fd26530351a7ab8f4c536b9480aa8789227efcce3f32",
+                    "mixHash" : "0xc912d97ca8da598550d905886263339bcf565ba0c694db5ce61feb3a5e92fb58",
+                    "nonce" : "0xb3383ea24d945915",
                     "number" : "0x01",
-                    "parentHash" : "20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
-                    "receiptTrie" : "f7b5e56f5467b1b17ce5f01eaaf1b8fe2e6b7e38b5d43b143ecb982f78cb51e5",
-                    "stateRoot" : "bbf0fa12937cca40d0c22311ebdc094cbe1dc4dc3986a7bed4dd7664d85952d8",
+                    "parentHash" : "0x20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
+                    "receiptTrie" : "0xf7b5e56f5467b1b17ce5f01eaaf1b8fe2e6b7e38b5d43b143ecb982f78cb51e5",
+                    "stateRoot" : "0xbbf0fa12937cca40d0c22311ebdc094cbe1dc4dc3986a7bed4dd7664d85952d8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a020db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbf0fa12937cca40d0c22311ebdc094cbe1dc4dc3986a7bed4dd7664d85952d8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f7b5e56f5467b1b17ce5f01eaaf1b8fe2e6b7e38b5d43b143ecb982f78cb51e5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a083a3ae84b444dc5e6d4e3875143d1739b8c10f51a9479e0942618ae30e0bf84b887b3de68da348f9b3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a020db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbf0fa12937cca40d0c22311ebdc094cbe1dc4dc3986a7bed4dd7664d85952d8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f7b5e56f5467b1b17ce5f01eaaf1b8fe2e6b7e38b5d43b143ecb982f78cb51e5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0c912d97ca8da598550d905886263339bcf565ba0c694db5ce61feb3a5e92fb5888b3383ea24d945915f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -168,28 +178,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8e9e91e6f107559d9eb9f6348ec3e2dd7a4a8f4e3bcc762d63fea069e4bc1a6e",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8e9e91e6f107559d9eb9f6348ec3e2dd7a4a8f4e3bcc762d63fea069e4bc1a6e",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08e9e91e6f107559d9eb9f6348ec3e2dd7a4a8f4e3bcc762d63fea069e4bc1a6ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "918274871764ecd917b5124ffa557d8303478333aaf76a24e4a88945ccf286ee",
+        "lastblockhash" : "0xa1b7a881534c9f403e98fd26530351a7ab8f4c536b9480aa8789227efcce3f32",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -197,60 +207,60 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f50798",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762f868",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -258,36 +268,41 @@
         }
     },
     "callcallcode_01_OOGE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcode_01_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010270",
-                    "hash" : "30b9da03e8ea0087dae97ed87ff4ad00b033b7c667a4fe0fc4e4fe00e2a69014",
-                    "mixHash" : "fbda7c2481bc6dea06e9be107817a75f443b2b5cec6ae6aded2717169af1f31e",
-                    "nonce" : "b97afcbfdec615c8",
+                    "hash" : "0xc76abf391ebd8ac7319a297051722bcabf13a701cb6897e529c43b8cf048e775",
+                    "mixHash" : "0xcf04ade3caa0b39f2ee4933285dfed1f8370ccea034fb07ed7c43ca716b0d3fc",
+                    "nonce" : "0x3a3645c2cb3cad03",
                     "number" : "0x01",
-                    "parentHash" : "20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
-                    "receiptTrie" : "e63850d1813a969121cc922418f109ac515ea12d56b4df9f15e5e507ebc40e54",
-                    "stateRoot" : "151c832284e7237fa515255a46d236b002e0772877fa290b800121a67f9a5bb9",
+                    "parentHash" : "0x20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
+                    "receiptTrie" : "0xe63850d1813a969121cc922418f109ac515ea12d56b4df9f15e5e507ebc40e54",
+                    "stateRoot" : "0x151c832284e7237fa515255a46d236b002e0772877fa290b800121a67f9a5bb9",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a020db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0151c832284e7237fa515255a46d236b002e0772877fa290b800121a67f9a5bb9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e63850d1813a969121cc922418f109ac515ea12d56b4df9f15e5e507ebc40e54b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a0fbda7c2481bc6dea06e9be107817a75f443b2b5cec6ae6aded2717169af1f31e88b97afcbfdec615c8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a020db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0151c832284e7237fa515255a46d236b002e0772877fa290b800121a67f9a5bb9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e63850d1813a969121cc922418f109ac515ea12d56b4df9f15e5e507ebc40e54b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a0cf04ade3caa0b39f2ee4933285dfed1f8370ccea034fb07ed7c43ca716b0d3fc883a3645c2cb3cad03f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -297,28 +312,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8e9e91e6f107559d9eb9f6348ec3e2dd7a4a8f4e3bcc762d63fea069e4bc1a6e",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8e9e91e6f107559d9eb9f6348ec3e2dd7a4a8f4e3bcc762d63fea069e4bc1a6e",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08e9e91e6f107559d9eb9f6348ec3e2dd7a4a8f4e3bcc762d63fea069e4bc1a6ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "30b9da03e8ea0087dae97ed87ff4ad00b033b7c667a4fe0fc4e4fe00e2a69014",
+        "lastblockhash" : "0xc76abf391ebd8ac7319a297051722bcabf13a701cb6897e529c43b8cf048e775",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -326,60 +341,60 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f50270",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762fd90",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -387,36 +402,41 @@
         }
     },
     "callcallcode_01_OOGE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcode_01_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010270",
-                    "hash" : "54ac02618b195e08bb3418d326123ca2c6f76ac89c71e1e7fb60257e048cb62c",
-                    "mixHash" : "3d2d0156eba6aa95d74391c2dfdc4e3af1e804a758cc68d908aa1b812b09a98d",
-                    "nonce" : "9900c34b8a7912bd",
+                    "hash" : "0x816e37af6789e2f83f12c9fc940bf599e3054dad8dd1a25df2ed6490dbd61a98",
+                    "mixHash" : "0x5d5422f85954a20d9152ea150b55e23dec24162efe48658ddefb3f95f2cdfdc8",
+                    "nonce" : "0x7612f26116bab40b",
                     "number" : "0x01",
-                    "parentHash" : "20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
-                    "receiptTrie" : "e63850d1813a969121cc922418f109ac515ea12d56b4df9f15e5e507ebc40e54",
-                    "stateRoot" : "151c832284e7237fa515255a46d236b002e0772877fa290b800121a67f9a5bb9",
+                    "parentHash" : "0x20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
+                    "receiptTrie" : "0xe63850d1813a969121cc922418f109ac515ea12d56b4df9f15e5e507ebc40e54",
+                    "stateRoot" : "0x151c832284e7237fa515255a46d236b002e0772877fa290b800121a67f9a5bb9",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a020db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0151c832284e7237fa515255a46d236b002e0772877fa290b800121a67f9a5bb9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e63850d1813a969121cc922418f109ac515ea12d56b4df9f15e5e507ebc40e54b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a03d2d0156eba6aa95d74391c2dfdc4e3af1e804a758cc68d908aa1b812b09a98d889900c34b8a7912bdf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a020db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0151c832284e7237fa515255a46d236b002e0772877fa290b800121a67f9a5bb9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e63850d1813a969121cc922418f109ac515ea12d56b4df9f15e5e507ebc40e54b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a05d5422f85954a20d9152ea150b55e23dec24162efe48658ddefb3f95f2cdfdc8887612f26116bab40bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -426,28 +446,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8e9e91e6f107559d9eb9f6348ec3e2dd7a4a8f4e3bcc762d63fea069e4bc1a6e",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8e9e91e6f107559d9eb9f6348ec3e2dd7a4a8f4e3bcc762d63fea069e4bc1a6e",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08e9e91e6f107559d9eb9f6348ec3e2dd7a4a8f4e3bcc762d63fea069e4bc1a6ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "54ac02618b195e08bb3418d326123ca2c6f76ac89c71e1e7fb60257e048cb62c",
+        "lastblockhash" : "0x816e37af6789e2f83f12c9fc940bf599e3054dad8dd1a25df2ed6490dbd61a98",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -455,60 +475,201 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f50270",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762fd90",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x26ad6b38bdd1c351d3b425932693dc02932c56352071b8de8e004386f8d574e2",
+                    "mixHash" : "0x6fd4ae660a060e49fd57c89c31d7d496e5b33d3584cef11888227e0012162cf9",
+                    "nonce" : "0x2bbd568a0def4d4f",
+                    "number" : "0x01",
+                    "parentHash" : "0x20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
+                    "receiptTrie" : "0xfca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834",
+                    "stateRoot" : "0xd5362d0a4d9d05b1d1a535867308020ab4d4c0117c6854a7f3f202620619fd37",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a020db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5362d0a4d9d05b1d1a535867308020ab4d4c0117c6854a7f3f202620619fd37a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a06fd4ae660a060e49fd57c89c31d7d496e5b33d3584cef11888227e0012162cf9882bbd568a0def4d4ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0x26ad6b38bdd1c351d3b425932693dc02932c56352071b8de8e004386f8d574e2",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd_d0g0v0.json
index e21b81d50..50883eb5b 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcode_01_SuicideEnd_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcode_01_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ed",
-                    "hash" : "130edf0d8b40c38f1e36c0fa568a6863230f3497525069fa0692a8e86e4562cb",
-                    "mixHash" : "be67f4b8080eee0e73d3ed86fbd223cd54f7dfa33d30745cf603744f77ebb86a",
-                    "nonce" : "104475c8babba30e",
+                    "hash" : "0x5bf57d95cfb3ba490d960a9e3b297bdf4d197281b1d1879aa0ccf48cb17a1b1b",
+                    "mixHash" : "0x187bfc377d9e255732f62388c340fa67c74573304db73482191d9f372aa182d5",
+                    "nonce" : "0x1347b6426d113879",
                     "number" : "0x01",
-                    "parentHash" : "6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
-                    "receiptTrie" : "dc8e4a35c328ff67b97192639d1b692d2805d665897e650d57c6c6d7763dcfa8",
-                    "stateRoot" : "795c5c6c597d917f07b596ccf61eaa9b2a08eed9575065a67cc9fe52c4f7a14a",
+                    "parentHash" : "0x6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
+                    "receiptTrie" : "0xdc8e4a35c328ff67b97192639d1b692d2805d665897e650d57c6c6d7763dcfa8",
+                    "stateRoot" : "0x795c5c6c597d917f07b596ccf61eaa9b2a08eed9575065a67cc9fe52c4f7a14a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0795c5c6c597d917f07b596ccf61eaa9b2a08eed9575065a67cc9fe52c4f7a14aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0dc8e4a35c328ff67b97192639d1b692d2805d665897e650d57c6c6d7763dcfa8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0be67f4b8080eee0e73d3ed86fbd223cd54f7dfa33d30745cf603744f77ebb86a88104475c8babba30ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a06b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0795c5c6c597d917f07b596ccf61eaa9b2a08eed9575065a67cc9fe52c4f7a14aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0dc8e4a35c328ff67b97192639d1b692d2805d665897e650d57c6c6d7763dcfa8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0187bfc377d9e255732f62388c340fa67c74573304db73482191d9f372aa182d5881347b6426d113879f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "bf9da25daced2ab58bc8a6f47cd2c2de94a26ef85ee94b75a349d97047f82205",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbf9da25daced2ab58bc8a6f47cd2c2de94a26ef85ee94b75a349d97047f82205",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf9da25daced2ab58bc8a6f47cd2c2de94a26ef85ee94b75a349d97047f82205a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "130edf0d8b40c38f1e36c0fa568a6863230f3497525069fa0692a8e86e4562cb",
+        "lastblockhash" : "0x5bf57d95cfb3ba490d960a9e3b297bdf4d197281b1d1879aa0ccf48cb17a1b1b",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -68,53 +73,53 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f7ed",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7630813",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -122,36 +127,41 @@
         }
     },
     "callcallcode_01_SuicideEnd_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcode_01_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ed",
-                    "hash" : "6524c4cabec58b44a11b631946e32e45388eef1e9e9d925547f41a36fb3c5fa2",
-                    "mixHash" : "47724f60a97e0b7004bb2813b0ca444613de9b639fbca27126a0141105cda3b6",
-                    "nonce" : "dd6819dfd18bf30e",
+                    "hash" : "0x5f20e5b70d87a086aaf5493b4685491175c43311985d9ea5b89067b347cc18ea",
+                    "mixHash" : "0xc96af6d5e75ec8230854f384ebda778979fd01f06d0dd0ad8fcd37485073803c",
+                    "nonce" : "0xae4fb1962ffc7b94",
                     "number" : "0x01",
-                    "parentHash" : "6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
-                    "receiptTrie" : "dc8e4a35c328ff67b97192639d1b692d2805d665897e650d57c6c6d7763dcfa8",
-                    "stateRoot" : "795c5c6c597d917f07b596ccf61eaa9b2a08eed9575065a67cc9fe52c4f7a14a",
+                    "parentHash" : "0x6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
+                    "receiptTrie" : "0xdc8e4a35c328ff67b97192639d1b692d2805d665897e650d57c6c6d7763dcfa8",
+                    "stateRoot" : "0x795c5c6c597d917f07b596ccf61eaa9b2a08eed9575065a67cc9fe52c4f7a14a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0795c5c6c597d917f07b596ccf61eaa9b2a08eed9575065a67cc9fe52c4f7a14aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0dc8e4a35c328ff67b97192639d1b692d2805d665897e650d57c6c6d7763dcfa8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a047724f60a97e0b7004bb2813b0ca444613de9b639fbca27126a0141105cda3b688dd6819dfd18bf30ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a06b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0795c5c6c597d917f07b596ccf61eaa9b2a08eed9575065a67cc9fe52c4f7a14aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0dc8e4a35c328ff67b97192639d1b692d2805d665897e650d57c6c6d7763dcfa8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0c96af6d5e75ec8230854f384ebda778979fd01f06d0dd0ad8fcd37485073803c88ae4fb1962ffc7b94f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -161,28 +171,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "bf9da25daced2ab58bc8a6f47cd2c2de94a26ef85ee94b75a349d97047f82205",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbf9da25daced2ab58bc8a6f47cd2c2de94a26ef85ee94b75a349d97047f82205",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf9da25daced2ab58bc8a6f47cd2c2de94a26ef85ee94b75a349d97047f82205a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "6524c4cabec58b44a11b631946e32e45388eef1e9e9d925547f41a36fb3c5fa2",
+        "lastblockhash" : "0x5f20e5b70d87a086aaf5493b4685491175c43311985d9ea5b89067b347cc18ea",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -190,53 +200,53 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f7ed",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7630813",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -244,36 +254,41 @@
         }
     },
     "callcallcode_01_SuicideEnd_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcode_01_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xdf3d",
-                    "hash" : "0e919d29b169240744c18916f7db8b552fbe3af08c7c6d5b1a27947e3316b869",
-                    "mixHash" : "a76953f1a3501c59d2e4db76a088f7c4207ac11d16d48aa6e86c589b94d2dcdc",
-                    "nonce" : "8ed2b7a10c73039c",
+                    "hash" : "0x14f84d78579a098efc4af536ce553db5909b0de6817c30d8fe8c4bd458df21e7",
+                    "mixHash" : "0xec2c271becca9cc1acb127abab32eeb41c0085fcddf2a520442cea1a4923d17c",
+                    "nonce" : "0xddf7a01821ad5cfd",
                     "number" : "0x01",
-                    "parentHash" : "6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
-                    "receiptTrie" : "893d3c9bb61b01119d06c9035f0d5778f2609d97e156d4edbb2c46d9d1ab5226",
-                    "stateRoot" : "82daea0e72448198306a7e3d326ba9fd4055d1dbebd044f54d282d63aaa103f0",
+                    "parentHash" : "0x6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
+                    "receiptTrie" : "0x893d3c9bb61b01119d06c9035f0d5778f2609d97e156d4edbb2c46d9d1ab5226",
+                    "stateRoot" : "0x82daea0e72448198306a7e3d326ba9fd4055d1dbebd044f54d282d63aaa103f0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082daea0e72448198306a7e3d326ba9fd4055d1dbebd044f54d282d63aaa103f0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0893d3c9bb61b01119d06c9035f0d5778f2609d97e156d4edbb2c46d9d1ab5226b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0a76953f1a3501c59d2e4db76a088f7c4207ac11d16d48aa6e86c589b94d2dcdc888ed2b7a10c73039cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a06b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082daea0e72448198306a7e3d326ba9fd4055d1dbebd044f54d282d63aaa103f0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0893d3c9bb61b01119d06c9035f0d5778f2609d97e156d4edbb2c46d9d1ab5226b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0ec2c271becca9cc1acb127abab32eeb41c0085fcddf2a520442cea1a4923d17c88ddf7a01821ad5cfdf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -283,28 +298,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "bf9da25daced2ab58bc8a6f47cd2c2de94a26ef85ee94b75a349d97047f82205",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbf9da25daced2ab58bc8a6f47cd2c2de94a26ef85ee94b75a349d97047f82205",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf9da25daced2ab58bc8a6f47cd2c2de94a26ef85ee94b75a349d97047f82205a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0e919d29b169240744c18916f7db8b552fbe3af08c7c6d5b1a27947e3316b869",
+        "lastblockhash" : "0x14f84d78579a098efc4af536ce553db5909b0de6817c30d8fe8c4bd458df21e7",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -312,53 +327,53 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4df3d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a76320c3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -366,36 +381,41 @@
         }
     },
     "callcallcode_01_SuicideEnd_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcode_01_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xdf3d",
-                    "hash" : "056cef96c55a71420f4f3f300398fae03e266fb72de4b7b8a1ce763f24422633",
-                    "mixHash" : "996a755ab736a9ac507374a323b18fed4a0e92ae380d007babfc8bdf39ab4f6a",
-                    "nonce" : "478493229fa0a90f",
+                    "hash" : "0x58df58af65d9919ea8d85c49c6f621ccb4fedd97471687c71e36e48675f6ef3d",
+                    "mixHash" : "0x19e13e27609556a3253ff618975af14e2ada6509f5185fd6f4d4769bb3a41650",
+                    "nonce" : "0x2bf73e99a876db47",
                     "number" : "0x01",
-                    "parentHash" : "6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
-                    "receiptTrie" : "893d3c9bb61b01119d06c9035f0d5778f2609d97e156d4edbb2c46d9d1ab5226",
-                    "stateRoot" : "82daea0e72448198306a7e3d326ba9fd4055d1dbebd044f54d282d63aaa103f0",
+                    "parentHash" : "0x6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
+                    "receiptTrie" : "0x893d3c9bb61b01119d06c9035f0d5778f2609d97e156d4edbb2c46d9d1ab5226",
+                    "stateRoot" : "0x82daea0e72448198306a7e3d326ba9fd4055d1dbebd044f54d282d63aaa103f0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082daea0e72448198306a7e3d326ba9fd4055d1dbebd044f54d282d63aaa103f0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0893d3c9bb61b01119d06c9035f0d5778f2609d97e156d4edbb2c46d9d1ab5226b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0996a755ab736a9ac507374a323b18fed4a0e92ae380d007babfc8bdf39ab4f6a88478493229fa0a90ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a06b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082daea0e72448198306a7e3d326ba9fd4055d1dbebd044f54d282d63aaa103f0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0893d3c9bb61b01119d06c9035f0d5778f2609d97e156d4edbb2c46d9d1ab5226b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a019e13e27609556a3253ff618975af14e2ada6509f5185fd6f4d4769bb3a41650882bf73e99a876db47f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -405,28 +425,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "bf9da25daced2ab58bc8a6f47cd2c2de94a26ef85ee94b75a349d97047f82205",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbf9da25daced2ab58bc8a6f47cd2c2de94a26ef85ee94b75a349d97047f82205",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf9da25daced2ab58bc8a6f47cd2c2de94a26ef85ee94b75a349d97047f82205a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "056cef96c55a71420f4f3f300398fae03e266fb72de4b7b8a1ce763f24422633",
+        "lastblockhash" : "0x58df58af65d9919ea8d85c49c6f621ccb4fedd97471687c71e36e48675f6ef3d",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -434,53 +454,187 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4df3d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a76320c3",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x4d076b685c92435719940d0bd6bb822cded02d77f8a5982bbad3d0d931cd2e56",
+                    "mixHash" : "0xa853324ef2bdce05664cdc7cd575d796bee6244b674b0d503822289100049f9e",
+                    "nonce" : "0xe30dfaa113ab5e56",
+                    "number" : "0x01",
+                    "parentHash" : "0x6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
+                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
+                    "stateRoot" : "0xd2b31c26b5fb837335808a91d5eda03a82b9111a49685513f0e93a194e965200",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a06b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2b31c26b5fb837335808a91d5eda03a82b9111a49685513f0e93a194e965200a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0a853324ef2bdce05664cdc7cd575d796bee6244b674b0d503822289100049f9e88e30dfaa113ab5e56f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x4d076b685c92435719940d0bd6bb822cded02d77f8a5982bbad3d0d931cd2e56",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_d0g0v0.json
index bdedc0328..ac694ad22 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcode_01_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcode_01_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03997d",
-                    "hash" : "fc254a3ce0f246bd2ca5cd742483be080130d0133d18d54fd78254e5d4ae6d34",
-                    "mixHash" : "1bad1d92a154bbb88487500f7f6e34f820aa11fa0ebe27e0f8ee282671146991",
-                    "nonce" : "67ddd90516221383",
+                    "hash" : "0xfc5360428ef9104657b7dec82c86e1a6febcfadad271643a60c79d88f95fe5e7",
+                    "mixHash" : "0x54c39173b6b1480ded5171d0c74809f6dc2bf39ff1728fe1699fb376e7484d94",
+                    "nonce" : "0xda4c08e3a76a2cee",
                     "number" : "0x01",
-                    "parentHash" : "5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
-                    "receiptTrie" : "b167726f212e6cde4fa3e73d2890c64b2f7114d1dc5fa2ada765e887472d035a",
-                    "stateRoot" : "d203d1d8037f37ef3d357fe745e5c383d526a0ed650e80ae809b68112693b4dd",
+                    "parentHash" : "0x5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
+                    "receiptTrie" : "0xb167726f212e6cde4fa3e73d2890c64b2f7114d1dc5fa2ada765e887472d035a",
+                    "stateRoot" : "0xd203d1d8037f37ef3d357fe745e5c383d526a0ed650e80ae809b68112693b4dd",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a05ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d203d1d8037f37ef3d357fe745e5c383d526a0ed650e80ae809b68112693b4dda05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0b167726f212e6cde4fa3e73d2890c64b2f7114d1dc5fa2ada765e887472d035ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a01bad1d92a154bbb88487500f7f6e34f820aa11fa0ebe27e0f8ee2826711469918867ddd90516221383f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a05ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d203d1d8037f37ef3d357fe745e5c383d526a0ed650e80ae809b68112693b4dda05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0b167726f212e6cde4fa3e73d2890c64b2f7114d1dc5fa2ada765e887472d035ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a054c39173b6b1480ded5171d0c74809f6dc2bf39ff1728fe1699fb376e7484d9488da4c08e3a76a2ceef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e5caf717f71a3305034460ddabad9c3952a3dc2b25daba81b16cbfe65c2a329c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe5caf717f71a3305034460ddabad9c3952a3dc2b25daba81b16cbfe65c2a329c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5caf717f71a3305034460ddabad9c3952a3dc2b25daba81b16cbfe65c2a329ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "fc254a3ce0f246bd2ca5cd742483be080130d0133d18d54fd78254e5d4ae6d34",
+        "lastblockhash" : "0xfc5360428ef9104657b7dec82c86e1a6febcfadad271643a60c79d88f95fe5e7",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640001",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
                 "nonce" : "0x00",
@@ -84,53 +89,53 @@
                     "0xf0" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7997d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7606683",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -138,36 +143,41 @@
         }
     },
     "callcallcode_01_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcode_01_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03997d",
-                    "hash" : "2ac7ea9505492d725ae8c4b5cf4967899050dcadd4fd9d9d9237949b2c56f9e5",
-                    "mixHash" : "baf2435fdb850f0ac76fc51ccda9f959d97a8deecb0e5add5fef167552140ab2",
-                    "nonce" : "ec71b97170e057f6",
+                    "hash" : "0x11ebc505fe1bdd3b07cb9a933595bbc65d286d90bbc54e3097bd463b86d929f7",
+                    "mixHash" : "0x3d9c6166012e5dca499bd2da16433b53807c90d2702c2fe31a814d7c1826b523",
+                    "nonce" : "0x5b1e920a07eb46bb",
                     "number" : "0x01",
-                    "parentHash" : "5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
-                    "receiptTrie" : "b167726f212e6cde4fa3e73d2890c64b2f7114d1dc5fa2ada765e887472d035a",
-                    "stateRoot" : "d203d1d8037f37ef3d357fe745e5c383d526a0ed650e80ae809b68112693b4dd",
+                    "parentHash" : "0x5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
+                    "receiptTrie" : "0xb167726f212e6cde4fa3e73d2890c64b2f7114d1dc5fa2ada765e887472d035a",
+                    "stateRoot" : "0xd203d1d8037f37ef3d357fe745e5c383d526a0ed650e80ae809b68112693b4dd",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a05ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d203d1d8037f37ef3d357fe745e5c383d526a0ed650e80ae809b68112693b4dda05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0b167726f212e6cde4fa3e73d2890c64b2f7114d1dc5fa2ada765e887472d035ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a0baf2435fdb850f0ac76fc51ccda9f959d97a8deecb0e5add5fef167552140ab288ec71b97170e057f6f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a05ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d203d1d8037f37ef3d357fe745e5c383d526a0ed650e80ae809b68112693b4dda05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0b167726f212e6cde4fa3e73d2890c64b2f7114d1dc5fa2ada765e887472d035ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a03d9c6166012e5dca499bd2da16433b53807c90d2702c2fe31a814d7c1826b523885b1e920a07eb46bbf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -177,28 +187,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e5caf717f71a3305034460ddabad9c3952a3dc2b25daba81b16cbfe65c2a329c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe5caf717f71a3305034460ddabad9c3952a3dc2b25daba81b16cbfe65c2a329c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5caf717f71a3305034460ddabad9c3952a3dc2b25daba81b16cbfe65c2a329ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2ac7ea9505492d725ae8c4b5cf4967899050dcadd4fd9d9d9237949b2c56f9e5",
+        "lastblockhash" : "0x11ebc505fe1bdd3b07cb9a933595bbc65d286d90bbc54e3097bd463b86d929f7",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -206,7 +216,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640001",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
                 "nonce" : "0x00",
@@ -222,53 +232,53 @@
                     "0xf0" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7997d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7606683",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -276,36 +286,41 @@
         }
     },
     "callcallcode_01_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcode_01_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x039455",
-                    "hash" : "ea17a414825d5697df8b8df7d98e6bf5cfdf0cca68404ab126b3f31fd27e824c",
-                    "mixHash" : "10f5a9a35333cb4dc4fdea61ede2e63dc446af7c47bec6bcbfb2df968c4f911a",
-                    "nonce" : "9d640baee78f6cbc",
+                    "hash" : "0x404383f8e0d5b5c5ec7f66cefb26fd87ad01495924f7b46cc35899ac3b60991b",
+                    "mixHash" : "0x58fae47fc10345dd308cf930422a54222e97ced3b431a270d81284176b2db6be",
+                    "nonce" : "0xfe634d22722481be",
                     "number" : "0x01",
-                    "parentHash" : "5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
-                    "receiptTrie" : "e51736d11d30f60a4d982e873ff70304a7779922072f5f449b5aa550b5d7feee",
-                    "stateRoot" : "8c284cd17b736b213e5e00cdb7ccedb131abacda2bc12e9178c2f760741040d1",
+                    "parentHash" : "0x5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
+                    "receiptTrie" : "0xe51736d11d30f60a4d982e873ff70304a7779922072f5f449b5aa550b5d7feee",
+                    "stateRoot" : "0x8c284cd17b736b213e5e00cdb7ccedb131abacda2bc12e9178c2f760741040d1",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a05ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c284cd17b736b213e5e00cdb7ccedb131abacda2bc12e9178c2f760741040d1a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e51736d11d30f60a4d982e873ff70304a7779922072f5f449b5aa550b5d7feeeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a010f5a9a35333cb4dc4fdea61ede2e63dc446af7c47bec6bcbfb2df968c4f911a889d640baee78f6cbcf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a05ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c284cd17b736b213e5e00cdb7ccedb131abacda2bc12e9178c2f760741040d1a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e51736d11d30f60a4d982e873ff70304a7779922072f5f449b5aa550b5d7feeeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a058fae47fc10345dd308cf930422a54222e97ced3b431a270d81284176b2db6be88fe634d22722481bef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -315,28 +330,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e5caf717f71a3305034460ddabad9c3952a3dc2b25daba81b16cbfe65c2a329c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe5caf717f71a3305034460ddabad9c3952a3dc2b25daba81b16cbfe65c2a329c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5caf717f71a3305034460ddabad9c3952a3dc2b25daba81b16cbfe65c2a329ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ea17a414825d5697df8b8df7d98e6bf5cfdf0cca68404ab126b3f31fd27e824c",
+        "lastblockhash" : "0x404383f8e0d5b5c5ec7f66cefb26fd87ad01495924f7b46cc35899ac3b60991b",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -344,7 +359,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640001",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
                 "nonce" : "0x00",
@@ -360,53 +375,53 @@
                     "0xf0" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f79455",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7606bab",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -414,36 +429,41 @@
         }
     },
     "callcallcode_01_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcode_01_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x039455",
-                    "hash" : "94f41d1022550a4fb1838d287bfb284249c3719b9cbdfcd22e70035e03472c5e",
-                    "mixHash" : "601b669648b5e51e2e2fe7d6c8b5d95568892b7b4a23771476679c6d36dced86",
-                    "nonce" : "e61c25790ff3a7a2",
+                    "hash" : "0x8086da65f2e3e889fa3a2e0c48ac813f293b576edc3936069b85b10d25fbb78f",
+                    "mixHash" : "0xe56c40abcda7c8c80b621fedb7e0bcdc4a86a09fc75171b5ed3a2053b3048a19",
+                    "nonce" : "0xfe9d6394e9fd9ddc",
                     "number" : "0x01",
-                    "parentHash" : "5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
-                    "receiptTrie" : "e51736d11d30f60a4d982e873ff70304a7779922072f5f449b5aa550b5d7feee",
-                    "stateRoot" : "8c284cd17b736b213e5e00cdb7ccedb131abacda2bc12e9178c2f760741040d1",
+                    "parentHash" : "0x5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
+                    "receiptTrie" : "0xe51736d11d30f60a4d982e873ff70304a7779922072f5f449b5aa550b5d7feee",
+                    "stateRoot" : "0x8c284cd17b736b213e5e00cdb7ccedb131abacda2bc12e9178c2f760741040d1",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a05ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c284cd17b736b213e5e00cdb7ccedb131abacda2bc12e9178c2f760741040d1a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e51736d11d30f60a4d982e873ff70304a7779922072f5f449b5aa550b5d7feeeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a0601b669648b5e51e2e2fe7d6c8b5d95568892b7b4a23771476679c6d36dced8688e61c25790ff3a7a2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a05ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c284cd17b736b213e5e00cdb7ccedb131abacda2bc12e9178c2f760741040d1a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e51736d11d30f60a4d982e873ff70304a7779922072f5f449b5aa550b5d7feeeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a0e56c40abcda7c8c80b621fedb7e0bcdc4a86a09fc75171b5ed3a2053b3048a1988fe9d6394e9fd9ddcf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -453,28 +473,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e5caf717f71a3305034460ddabad9c3952a3dc2b25daba81b16cbfe65c2a329c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe5caf717f71a3305034460ddabad9c3952a3dc2b25daba81b16cbfe65c2a329c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5caf717f71a3305034460ddabad9c3952a3dc2b25daba81b16cbfe65c2a329ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "94f41d1022550a4fb1838d287bfb284249c3719b9cbdfcd22e70035e03472c5e",
+        "lastblockhash" : "0x8086da65f2e3e889fa3a2e0c48ac813f293b576edc3936069b85b10d25fbb78f",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -482,7 +502,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640001",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
                 "nonce" : "0x00",
@@ -498,53 +518,203 @@
                     "0xf0" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f79455",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7606bab",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcode_01_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x03997d",
+                    "hash" : "0xfa4974f9967e4a5aa5c68d0f057d59ec82069d0ce96266d7ab2a2e0109561655",
+                    "mixHash" : "0xce8f9c6a69bac8c8f08d09f6d7bd93990b14fdfad72d1299f91d35f0531c65d9",
+                    "nonce" : "0x0e5f9357d9d7470a",
+                    "number" : "0x01",
+                    "parentHash" : "0x5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
+                    "receiptTrie" : "0x607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03beb",
+                    "stateRoot" : "0x94728ec6c758d0b2efe13908694f693c2bec783cd1b3409d8294386f4a54c3e2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a05ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094728ec6c758d0b2efe13908694f693c2bec783cd1b3409d8294386f4a54c3e2a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03bebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a0ce8f9c6a69bac8c8f08d09f6d7bd93990b14fdfad72d1299f91d35f0531c65d9880e5f9357d9d7470af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xfa4974f9967e4a5aa5c68d0f057d59ec82069d0ce96266d7ab2a2e0109561655",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE_d0g0v0.json
index 4f21dde49..b462c49a2 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcodecall_010_OOGE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "6294733a9ed2e3f420bc283c1e9caa38bbee6b95ce923afed667c1860f62b265",
-                    "mixHash" : "8b7f8b88020a95a00b84ce0b94d5774013037d74c4c62c687a41ba02a9a3cd33",
-                    "nonce" : "db2e32225b57d022",
+                    "hash" : "0x2e368e9f94184f98788fef59f4a23bba3ca935585051d53237b2f3f93cd9ecb8",
+                    "mixHash" : "0x05e674869ada7aa2af40a980f726fa0f68e78f62aee5ce0cb87ef51de8a75e92",
+                    "nonce" : "0x5d9d264d41dfa0f1",
                     "number" : "0x01",
-                    "parentHash" : "626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
-                    "receiptTrie" : "5c552db242198a94a9486845bab75b886c74d2a7bda4e54946c2660eb7fa8a4d",
-                    "stateRoot" : "870ea7301483aeb95fc534a48560aa5128a31c8bac14f1e0f666f2ebe3690c07",
+                    "parentHash" : "0x626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
+                    "receiptTrie" : "0x5c552db242198a94a9486845bab75b886c74d2a7bda4e54946c2660eb7fa8a4d",
+                    "stateRoot" : "0x870ea7301483aeb95fc534a48560aa5128a31c8bac14f1e0f666f2ebe3690c07",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0870ea7301483aeb95fc534a48560aa5128a31c8bac14f1e0f666f2ebe3690c07a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05c552db242198a94a9486845bab75b886c74d2a7bda4e54946c2660eb7fa8a4db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a08b7f8b88020a95a00b84ce0b94d5774013037d74c4c62c687a41ba02a9a3cd3388db2e32225b57d022f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0870ea7301483aeb95fc534a48560aa5128a31c8bac14f1e0f666f2ebe3690c07a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05c552db242198a94a9486845bab75b886c74d2a7bda4e54946c2660eb7fa8a4db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a005e674869ada7aa2af40a980f726fa0f68e78f62aee5ce0cb87ef51de8a75e92885d9d264d41dfa0f1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "fe3f36886604a53a4984989b217801518ab579d82eaf7a37cc50949b7f2631d8",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfe3f36886604a53a4984989b217801518ab579d82eaf7a37cc50949b7f2631d8",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe3f36886604a53a4984989b217801518ab579d82eaf7a37cc50949b7f2631d8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "6294733a9ed2e3f420bc283c1e9caa38bbee6b95ce923afed667c1860f62b265",
+        "lastblockhash" : "0x2e368e9f94184f98788fef59f4a23bba3ca935585051d53237b2f3f93cd9ecb8",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
@@ -76,67 +81,67 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55892",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762a76e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -144,36 +149,41 @@
         }
     },
     "callcallcodecall_010_OOGE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "985eed4000450e8a7c5a2d30981714bfa602803191fbe5d01cc7f3f3c3a0fe5c",
-                    "mixHash" : "7b5a4b691054597462de0a239cfe2104dd36a5ae82b12a34771630386ba2dc83",
-                    "nonce" : "7b72de7be492d850",
+                    "hash" : "0x8c2eaa67fab05e210b91f7f28b11d4d0a15a4c68d88b3b5112d7a9f865dfc147",
+                    "mixHash" : "0x92ae3d66a63342c537da681f101c7150996bda4a5e5f4868c2c49aa1ee3ba521",
+                    "nonce" : "0x28bd766b9c470575",
                     "number" : "0x01",
-                    "parentHash" : "626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
-                    "receiptTrie" : "5c552db242198a94a9486845bab75b886c74d2a7bda4e54946c2660eb7fa8a4d",
-                    "stateRoot" : "870ea7301483aeb95fc534a48560aa5128a31c8bac14f1e0f666f2ebe3690c07",
+                    "parentHash" : "0x626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
+                    "receiptTrie" : "0x5c552db242198a94a9486845bab75b886c74d2a7bda4e54946c2660eb7fa8a4d",
+                    "stateRoot" : "0x870ea7301483aeb95fc534a48560aa5128a31c8bac14f1e0f666f2ebe3690c07",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0870ea7301483aeb95fc534a48560aa5128a31c8bac14f1e0f666f2ebe3690c07a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05c552db242198a94a9486845bab75b886c74d2a7bda4e54946c2660eb7fa8a4db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a07b5a4b691054597462de0a239cfe2104dd36a5ae82b12a34771630386ba2dc83887b72de7be492d850f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0870ea7301483aeb95fc534a48560aa5128a31c8bac14f1e0f666f2ebe3690c07a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05c552db242198a94a9486845bab75b886c74d2a7bda4e54946c2660eb7fa8a4db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a092ae3d66a63342c537da681f101c7150996bda4a5e5f4868c2c49aa1ee3ba5218828bd766b9c470575f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -183,28 +193,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "fe3f36886604a53a4984989b217801518ab579d82eaf7a37cc50949b7f2631d8",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfe3f36886604a53a4984989b217801518ab579d82eaf7a37cc50949b7f2631d8",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe3f36886604a53a4984989b217801518ab579d82eaf7a37cc50949b7f2631d8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "985eed4000450e8a7c5a2d30981714bfa602803191fbe5d01cc7f3f3c3a0fe5c",
+        "lastblockhash" : "0x8c2eaa67fab05e210b91f7f28b11d4d0a15a4c68d88b3b5112d7a9f865dfc147",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -212,7 +222,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
@@ -220,67 +230,67 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55892",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762a76e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -288,36 +298,41 @@
         }
     },
     "callcallcodecall_010_OOGE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "d09cd0c403303862fedf6d9951ac7da49e654bd9493606db825882c04aeb0b52",
-                    "mixHash" : "69cee0a184940f17a591eaab890a1fd0acc13b4539d2166cb32bcfa7b6fea5cf",
-                    "nonce" : "201d7fa522d6579b",
+                    "hash" : "0xf91aa0f5a0fd7dc8c9a5328a7ea5d97ff494315b16d78db0923177450ac8a634",
+                    "mixHash" : "0xa60213ac3d9d3f28864e3836211ef4cdebf0cb229a46c48550d0e8794d92df2a",
+                    "nonce" : "0x7f86f76265878865",
                     "number" : "0x01",
-                    "parentHash" : "626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
-                    "receiptTrie" : "a849827dc4664953c38ce117b0776f57aae6657707eaebc31b39eee67ea04584",
-                    "stateRoot" : "7581382fc20ed6c26b1bde11309b50347ac6e0d73c4dc617779047d91de826b6",
+                    "parentHash" : "0x626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
+                    "receiptTrie" : "0xa849827dc4664953c38ce117b0776f57aae6657707eaebc31b39eee67ea04584",
+                    "stateRoot" : "0x7581382fc20ed6c26b1bde11309b50347ac6e0d73c4dc617779047d91de826b6",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07581382fc20ed6c26b1bde11309b50347ac6e0d73c4dc617779047d91de826b6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a849827dc4664953c38ce117b0776f57aae6657707eaebc31b39eee67ea04584b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a069cee0a184940f17a591eaab890a1fd0acc13b4539d2166cb32bcfa7b6fea5cf88201d7fa522d6579bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07581382fc20ed6c26b1bde11309b50347ac6e0d73c4dc617779047d91de826b6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a849827dc4664953c38ce117b0776f57aae6657707eaebc31b39eee67ea04584b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0a60213ac3d9d3f28864e3836211ef4cdebf0cb229a46c48550d0e8794d92df2a887f86f76265878865f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -327,28 +342,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "fe3f36886604a53a4984989b217801518ab579d82eaf7a37cc50949b7f2631d8",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfe3f36886604a53a4984989b217801518ab579d82eaf7a37cc50949b7f2631d8",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe3f36886604a53a4984989b217801518ab579d82eaf7a37cc50949b7f2631d8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d09cd0c403303862fedf6d9951ac7da49e654bd9493606db825882c04aeb0b52",
+        "lastblockhash" : "0xf91aa0f5a0fd7dc8c9a5328a7ea5d97ff494315b16d78db0923177450ac8a634",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -356,7 +371,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
@@ -364,67 +379,67 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550d6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af2a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -432,36 +447,41 @@
         }
     },
     "callcallcodecall_010_OOGE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "5169cccd7bb571503347a482b282546c7ca6e224ee34d92886654fbca5a017c3",
-                    "mixHash" : "563a1d0040898de22134f7686a056e34dcae68d4016ec18737d774873a65a32b",
-                    "nonce" : "cc4a7be799f74f43",
+                    "hash" : "0x001ce3f49603827ae14e71f11b50f01f283236234948102a2a17324e822df0c9",
+                    "mixHash" : "0x3ea2e47f161a9fbf9e30a850dd9da0a46cc75d4c081a890085a03e5b0d6924c6",
+                    "nonce" : "0xcd174559a92324eb",
                     "number" : "0x01",
-                    "parentHash" : "626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
-                    "receiptTrie" : "a849827dc4664953c38ce117b0776f57aae6657707eaebc31b39eee67ea04584",
-                    "stateRoot" : "7581382fc20ed6c26b1bde11309b50347ac6e0d73c4dc617779047d91de826b6",
+                    "parentHash" : "0x626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
+                    "receiptTrie" : "0xa849827dc4664953c38ce117b0776f57aae6657707eaebc31b39eee67ea04584",
+                    "stateRoot" : "0x7581382fc20ed6c26b1bde11309b50347ac6e0d73c4dc617779047d91de826b6",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07581382fc20ed6c26b1bde11309b50347ac6e0d73c4dc617779047d91de826b6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a849827dc4664953c38ce117b0776f57aae6657707eaebc31b39eee67ea04584b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0563a1d0040898de22134f7686a056e34dcae68d4016ec18737d774873a65a32b88cc4a7be799f74f43f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07581382fc20ed6c26b1bde11309b50347ac6e0d73c4dc617779047d91de826b6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a849827dc4664953c38ce117b0776f57aae6657707eaebc31b39eee67ea04584b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a03ea2e47f161a9fbf9e30a850dd9da0a46cc75d4c081a890085a03e5b0d6924c688cd174559a92324ebf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -471,28 +491,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "fe3f36886604a53a4984989b217801518ab579d82eaf7a37cc50949b7f2631d8",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfe3f36886604a53a4984989b217801518ab579d82eaf7a37cc50949b7f2631d8",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe3f36886604a53a4984989b217801518ab579d82eaf7a37cc50949b7f2631d8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "5169cccd7bb571503347a482b282546c7ca6e224ee34d92886654fbca5a017c3",
+        "lastblockhash" : "0x001ce3f49603827ae14e71f11b50f01f283236234948102a2a17324e822df0c9",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -500,7 +520,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
@@ -508,67 +528,223 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550d6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af2a",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x62c08c6428dc49e36e7b9780fb797c2b1d172f7a9b7df8926febfee8cf918081",
+                    "mixHash" : "0x6b15a50c69fe81b8ac7f5a12379b6a6991b21f5e5893486d3188714ecf1c55c8",
+                    "nonce" : "0x8b98b05d0a7bf1ce",
+                    "number" : "0x01",
+                    "parentHash" : "0x626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0x3c389cab5b68f770eae7636dbfee320f18019f80d208fffd264ab75d3494a29a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c389cab5b68f770eae7636dbfee320f18019f80d208fffd264ab75d3494a29aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a06b15a50c69fe81b8ac7f5a12379b6a6991b21f5e5893486d3188714ecf1c55c8888b98b05d0a7bf1cef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0x62c08c6428dc49e36e7b9780fb797c2b1d172f7a9b7df8926febfee8cf918081",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter_d0g0v0.json
index 521bfa3b3..077bc0df9 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcodecall_010_OOGMAfter_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "4fa1835558d9314ea72b71db982e9a5604dc62d6efdc2874719ece06acd1284e",
-                    "mixHash" : "cfec5399084a034770e4a0ac61983033d80b33453ae557317c994626c0ce1dc6",
-                    "nonce" : "6e2b5995631ab3ed",
+                    "hash" : "0x885d3f9b506bcea343ba412c6b64d06583cc055e377a4b2ae5b1dd5e98c4500a",
+                    "mixHash" : "0xbec25ff51b283183ca1973fc6de85f92c9d2f5939e8c7a84a83819594713d120",
+                    "nonce" : "0x1d8dec6cd0bf98a2",
                     "number" : "0x01",
-                    "parentHash" : "0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
-                    "receiptTrie" : "c4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882",
-                    "stateRoot" : "830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7ca",
+                    "parentHash" : "0x0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
+                    "receiptTrie" : "0xc4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882",
+                    "stateRoot" : "0x830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7ca",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7caa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0cfec5399084a034770e4a0ac61983033d80b33453ae557317c994626c0ce1dc6886e2b5995631ab3edf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7caa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0bec25ff51b283183ca1973fc6de85f92c9d2f5939e8c7a84a83819594713d120881d8dec6cd0bf98a2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4fa1835558d9314ea72b71db982e9a5604dc62d6efdc2874719ece06acd1284e",
+        "lastblockhash" : "0x885d3f9b506bcea343ba412c6b64d06583cc055e377a4b2ae5b1dd5e98c4500a",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcallcodecall_010_OOGMAfter_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "5c32d65f160540dad4efb625ee004428eaf23605314ee9e505db7993c6499bbf",
-                    "mixHash" : "7ac68a4db8972dd8a366455d18488914609925b071ed095e100289c9cf07c048",
-                    "nonce" : "66adbe7c47256bbf",
+                    "hash" : "0xbcce699e0952782d241131d3cd935ecab3cb5a62361b2e381bea4f90268e1a63",
+                    "mixHash" : "0xdf7565bc1c5d9c8656713b226c7431c0173b14825f28a376cd1838e3d7fd0c38",
+                    "nonce" : "0x64d75a1bf4027863",
                     "number" : "0x01",
-                    "parentHash" : "0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
-                    "receiptTrie" : "c4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882",
-                    "stateRoot" : "830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7ca",
+                    "parentHash" : "0x0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
+                    "receiptTrie" : "0xc4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882",
+                    "stateRoot" : "0x830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7ca",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7caa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a07ac68a4db8972dd8a366455d18488914609925b071ed095e100289c9cf07c0488866adbe7c47256bbff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7caa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0df7565bc1c5d9c8656713b226c7431c0173b14825f28a376cd1838e3d7fd0c388864d75a1bf4027863f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "5c32d65f160540dad4efb625ee004428eaf23605314ee9e505db7993c6499bbf",
+        "lastblockhash" : "0xbcce699e0952782d241131d3cd935ecab3cb5a62361b2e381bea4f90268e1a63",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcallcodecall_010_OOGMAfter_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "6c7166316bdd6a2e73f359a5b09d3569f7c288bbca5597578c2bc616a4cb570b",
-                    "mixHash" : "0c9481f71c9ad268924cc26b7429e3ab248f5b504d2e4f9bcbffd85c6f30016a",
-                    "nonce" : "69a8b326af8ffce5",
+                    "hash" : "0x44812777d62bbe074bda915ba7cb7a9e3b43f4213e5fd969f78749dd596ba380",
+                    "mixHash" : "0x4bc8c1c56df84b9e587ddeaf543e45945e7d54e98ff8c5f5d9a70ad537213571",
+                    "nonce" : "0x83b3910266cd3c67",
                     "number" : "0x01",
-                    "parentHash" : "0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
-                    "receiptTrie" : "8894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189",
-                    "stateRoot" : "edf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602",
+                    "parentHash" : "0x0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
+                    "receiptTrie" : "0x8894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189",
+                    "stateRoot" : "0xedf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a00c9481f71c9ad268924cc26b7429e3ab248f5b504d2e4f9bcbffd85c6f30016a8869a8b326af8ffce5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a04bc8c1c56df84b9e587ddeaf543e45945e7d54e98ff8c5f5d9a70ad5372135718883b3910266cd3c67f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "6c7166316bdd6a2e73f359a5b09d3569f7c288bbca5597578c2bc616a4cb570b",
+        "lastblockhash" : "0x44812777d62bbe074bda915ba7cb7a9e3b43f4213e5fd969f78749dd596ba380",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcallcodecall_010_OOGMAfter_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "c1ba5c1640fa03ada9e4c5118a2160e2311a774e2eadfba79c3f13dd8d562845",
-                    "mixHash" : "1b4060c13fc8e7e3b1d2a5eab1f2cd4a9c8651cc6986bef82ad9b6fc5ad82e80",
-                    "nonce" : "46801be92f8b4f5e",
+                    "hash" : "0xe7937288a28bee15cb76da6f74ac4b08f40298b1c1bc07e4cb653f96562f4f7a",
+                    "mixHash" : "0xe0848db4ed6c0f9f8227dfb75d30a6e96c3b711de4f5a87bf889ea7f812e71ee",
+                    "nonce" : "0x3582f8a9f90511c3",
                     "number" : "0x01",
-                    "parentHash" : "0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
-                    "receiptTrie" : "8894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189",
-                    "stateRoot" : "edf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602",
+                    "parentHash" : "0x0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
+                    "receiptTrie" : "0x8894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189",
+                    "stateRoot" : "0xedf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a01b4060c13fc8e7e3b1d2a5eab1f2cd4a9c8651cc6986bef82ad9b6fc5ad82e808846801be92f8b4f5ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0e0848db4ed6c0f9f8227dfb75d30a6e96c3b711de4f5a87bf889ea7f812e71ee883582f8a9f90511c3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c1ba5c1640fa03ada9e4c5118a2160e2311a774e2eadfba79c3f13dd8d562845",
+        "lastblockhash" : "0xe7937288a28bee15cb76da6f74ac4b08f40298b1c1bc07e4cb653f96562f4f7a",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xc16c20362b0edaa26ebad11c0ba3f6a6fd09dd82bd7019237228f7dbadf07dd1",
+                    "mixHash" : "0xa68cb913c5b5a7e5d43007ac4dfc6b115168d7452f7c0e82489a8e8b2926a992",
+                    "nonce" : "0x86b7c9c733f3f0fc",
+                    "number" : "0x01",
+                    "parentHash" : "0x0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0xa02a6675f97f0fb58ed49b3dee17102caab53d2a34392fd9522dd49a8ab85e99",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a00c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a02a6675f97f0fb58ed49b3dee17102caab53d2a34392fd9522dd49a8ab85e99a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0a68cb913c5b5a7e5d43007ac4dfc6b115168d7452f7c0e82489a8e8b2926a9928886b7c9c733f3f0fcf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0xc16c20362b0edaa26ebad11c0ba3f6a6fd09dd82bd7019237228f7dbadf07dd1",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore_d0g0v0.json
index c449a828a..be50c1192 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcodecall_010_OOGMBefore_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "06934eb5f078c9925bcf51bea48a640e58c6eed7b2e1d0a3effc99f385b4cea6",
-                    "mixHash" : "b9d691d85aadd277afc5f565278741983dee819dd49ebf40329a9f2f08d28139",
-                    "nonce" : "090cd754a6d45086",
+                    "hash" : "0x7f9d52392e4662d280f5c3b1262bed595b1a554c7138bb0bac209ce128fea3fc",
+                    "mixHash" : "0x7931684c7cff2da976a4347a44422ab7209327a8951442ee7ffa17dfb22574b2",
+                    "nonce" : "0x5b8aaaa432db315d",
                     "number" : "0x01",
-                    "parentHash" : "0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
-                    "receiptTrie" : "505b68e1517a8046140524830ef7b1e3d31d0bea31437fcbf4a95fe9613b4dd2",
-                    "stateRoot" : "83ed91519b70dec0ac890c6d3595e6f18184cc474a737a9966e0917f70ac6adf",
+                    "parentHash" : "0x0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
+                    "receiptTrie" : "0x505b68e1517a8046140524830ef7b1e3d31d0bea31437fcbf4a95fe9613b4dd2",
+                    "stateRoot" : "0x83ed91519b70dec0ac890c6d3595e6f18184cc474a737a9966e0917f70ac6adf",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083ed91519b70dec0ac890c6d3595e6f18184cc474a737a9966e0917f70ac6adfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0505b68e1517a8046140524830ef7b1e3d31d0bea31437fcbf4a95fe9613b4dd2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0b9d691d85aadd277afc5f565278741983dee819dd49ebf40329a9f2f08d2813988090cd754a6d45086f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083ed91519b70dec0ac890c6d3595e6f18184cc474a737a9966e0917f70ac6adfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0505b68e1517a8046140524830ef7b1e3d31d0bea31437fcbf4a95fe9613b4dd2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a07931684c7cff2da976a4347a44422ab7209327a8951442ee7ffa17dfb22574b2885b8aaaa432db315df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "250bd9f5f4dc4c34cb9e321a213a909f3b6b68cdee23c1d9866074a3ce87d8ee",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x250bd9f5f4dc4c34cb9e321a213a909f3b6b68cdee23c1d9866074a3ce87d8ee",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0250bd9f5f4dc4c34cb9e321a213a909f3b6b68cdee23c1d9866074a3ce87d8eea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "06934eb5f078c9925bcf51bea48a640e58c6eed7b2e1d0a3effc99f385b4cea6",
+        "lastblockhash" : "0x7f9d52392e4662d280f5c3b1262bed595b1a554c7138bb0bac209ce128fea3fc",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa0c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcallcodecall_010_OOGMBefore_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "9190f8ce34a10dd416a5abb5d52cd2de722637955f7a5026e9069788c84d484b",
-                    "mixHash" : "220cd07c7c4f37ab1e83cf95561f95753c3fb14c19b5ef58e57f06a4bd1f8bc8",
-                    "nonce" : "10da61c9108dda72",
+                    "hash" : "0xeab99c25eff2abf867bba97b505d5d71fe6318f2154c701df2046e559f045270",
+                    "mixHash" : "0x6bf6292df0d664a447ffc6a42aabdcef6b7c5ad3b1b237617ee78191bf656941",
+                    "nonce" : "0xe610c08e11260853",
                     "number" : "0x01",
-                    "parentHash" : "0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
-                    "receiptTrie" : "505b68e1517a8046140524830ef7b1e3d31d0bea31437fcbf4a95fe9613b4dd2",
-                    "stateRoot" : "83ed91519b70dec0ac890c6d3595e6f18184cc474a737a9966e0917f70ac6adf",
+                    "parentHash" : "0x0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
+                    "receiptTrie" : "0x505b68e1517a8046140524830ef7b1e3d31d0bea31437fcbf4a95fe9613b4dd2",
+                    "stateRoot" : "0x83ed91519b70dec0ac890c6d3595e6f18184cc474a737a9966e0917f70ac6adf",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083ed91519b70dec0ac890c6d3595e6f18184cc474a737a9966e0917f70ac6adfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0505b68e1517a8046140524830ef7b1e3d31d0bea31437fcbf4a95fe9613b4dd2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0220cd07c7c4f37ab1e83cf95561f95753c3fb14c19b5ef58e57f06a4bd1f8bc88810da61c9108dda72f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083ed91519b70dec0ac890c6d3595e6f18184cc474a737a9966e0917f70ac6adfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0505b68e1517a8046140524830ef7b1e3d31d0bea31437fcbf4a95fe9613b4dd2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a06bf6292df0d664a447ffc6a42aabdcef6b7c5ad3b1b237617ee78191bf65694188e610c08e11260853f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "250bd9f5f4dc4c34cb9e321a213a909f3b6b68cdee23c1d9866074a3ce87d8ee",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x250bd9f5f4dc4c34cb9e321a213a909f3b6b68cdee23c1d9866074a3ce87d8ee",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0250bd9f5f4dc4c34cb9e321a213a909f3b6b68cdee23c1d9866074a3ce87d8eea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9190f8ce34a10dd416a5abb5d52cd2de722637955f7a5026e9069788c84d484b",
+        "lastblockhash" : "0xeab99c25eff2abf867bba97b505d5d71fe6318f2154c701df2046e559f045270",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa0c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcallcodecall_010_OOGMBefore_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "5fad97eeb3d3ebac8115de9e4214eed5f104f03f3c6d865de849cf7457706253",
-                    "mixHash" : "10000b257a8719818f51221ba95114d2e5f185ee64043935e7b064b1c3d94ad1",
-                    "nonce" : "0d6cd00f359ca76a",
+                    "hash" : "0x962fe49fd32ec2b1f9c6039f082f8b775cf9a0e08eb9ddb3dd7f6e0e73d83be2",
+                    "mixHash" : "0x1f4733d2675d015126da3e2da62c0273735c229d923a28f1f34f35c308071d85",
+                    "nonce" : "0x63415472abd65b9c",
                     "number" : "0x01",
-                    "parentHash" : "0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
-                    "receiptTrie" : "6d101b9208ce917beba2bb8ee40accd7dba5fb33a968ece3a1a40ac8f92f0cb9",
-                    "stateRoot" : "8a74bccfa35498e42eddc57b46c4f822b3f1d52fdf669adfa44954e69bbad245",
+                    "parentHash" : "0x0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
+                    "receiptTrie" : "0x6d101b9208ce917beba2bb8ee40accd7dba5fb33a968ece3a1a40ac8f92f0cb9",
+                    "stateRoot" : "0x8a74bccfa35498e42eddc57b46c4f822b3f1d52fdf669adfa44954e69bbad245",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a74bccfa35498e42eddc57b46c4f822b3f1d52fdf669adfa44954e69bbad245a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d101b9208ce917beba2bb8ee40accd7dba5fb33a968ece3a1a40ac8f92f0cb9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a010000b257a8719818f51221ba95114d2e5f185ee64043935e7b064b1c3d94ad1880d6cd00f359ca76af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a74bccfa35498e42eddc57b46c4f822b3f1d52fdf669adfa44954e69bbad245a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d101b9208ce917beba2bb8ee40accd7dba5fb33a968ece3a1a40ac8f92f0cb9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a01f4733d2675d015126da3e2da62c0273735c229d923a28f1f34f35c308071d858863415472abd65b9cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,28 +340,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "250bd9f5f4dc4c34cb9e321a213a909f3b6b68cdee23c1d9866074a3ce87d8ee",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x250bd9f5f4dc4c34cb9e321a213a909f3b6b68cdee23c1d9866074a3ce87d8ee",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0250bd9f5f4dc4c34cb9e321a213a909f3b6b68cdee23c1d9866074a3ce87d8eea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "5fad97eeb3d3ebac8115de9e4214eed5f104f03f3c6d865de849cf7457706253",
+        "lastblockhash" : "0x962fe49fd32ec2b1f9c6039f082f8b775cf9a0e08eb9ddb3dd7f6e0e73d83be2",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -354,74 +369,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -429,36 +444,41 @@
         }
     },
     "callcallcodecall_010_OOGMBefore_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "d4529a9efa3858ff144df3ebc7679e25151aecdae3411351d6a5332a86128e64",
-                    "mixHash" : "eba994aed176c91ef380aa037fa00e5477d547467c3a1e6b044a30188a08b2cc",
-                    "nonce" : "4c22c6690332ebb5",
+                    "hash" : "0x85a802c5a9f412dcfad00417e6495bb8d884395b970403e5d75b61fe3843fde1",
+                    "mixHash" : "0xafb4e0c694bd829dfecc81e15b0379a17019c06c91ca162fb5f5c43db53821f1",
+                    "nonce" : "0xa73e8fe852fb4b70",
                     "number" : "0x01",
-                    "parentHash" : "0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
-                    "receiptTrie" : "6d101b9208ce917beba2bb8ee40accd7dba5fb33a968ece3a1a40ac8f92f0cb9",
-                    "stateRoot" : "8a74bccfa35498e42eddc57b46c4f822b3f1d52fdf669adfa44954e69bbad245",
+                    "parentHash" : "0x0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
+                    "receiptTrie" : "0x6d101b9208ce917beba2bb8ee40accd7dba5fb33a968ece3a1a40ac8f92f0cb9",
+                    "stateRoot" : "0x8a74bccfa35498e42eddc57b46c4f822b3f1d52fdf669adfa44954e69bbad245",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a74bccfa35498e42eddc57b46c4f822b3f1d52fdf669adfa44954e69bbad245a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d101b9208ce917beba2bb8ee40accd7dba5fb33a968ece3a1a40ac8f92f0cb9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0eba994aed176c91ef380aa037fa00e5477d547467c3a1e6b044a30188a08b2cc884c22c6690332ebb5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a74bccfa35498e42eddc57b46c4f822b3f1d52fdf669adfa44954e69bbad245a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d101b9208ce917beba2bb8ee40accd7dba5fb33a968ece3a1a40ac8f92f0cb9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0afb4e0c694bd829dfecc81e15b0379a17019c06c91ca162fb5f5c43db53821f188a73e8fe852fb4b70f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -468,28 +488,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "250bd9f5f4dc4c34cb9e321a213a909f3b6b68cdee23c1d9866074a3ce87d8ee",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x250bd9f5f4dc4c34cb9e321a213a909f3b6b68cdee23c1d9866074a3ce87d8ee",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0250bd9f5f4dc4c34cb9e321a213a909f3b6b68cdee23c1d9866074a3ce87d8eea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d4529a9efa3858ff144df3ebc7679e25151aecdae3411351d6a5332a86128e64",
+        "lastblockhash" : "0x85a802c5a9f412dcfad00417e6495bb8d884395b970403e5d75b61fe3843fde1",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -497,74 +517,229 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xab4095a7a97d9c669069dde4f4966c3e1d5e31113fcbd6083c935435bd16d19b",
+                    "mixHash" : "0x8f76c95eccb00144b3e8ab6f99cea9dc01897d600abe1521d4f0e09ab46be29a",
+                    "nonce" : "0xc821009ba61fcd60",
+                    "number" : "0x01",
+                    "parentHash" : "0x0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0x30ada0ad3b390eea8cd1b1d4fef4dd2200f7bb2f29d4b278077a6e047bb61d94",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a00366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa030ada0ad3b390eea8cd1b1d4fef4dd2200f7bb2f29d4b278077a6e047bb61d94a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a08f76c95eccb00144b3e8ab6f99cea9dc01897d600abe1521d4f0e09ab46be29a88c821009ba61fcd60f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0xab4095a7a97d9c669069dde4f4966c3e1d5e31113fcbd6083c935435bd16d19b",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd_d0g0v0.json
index e507b596d..d781bffa9 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcodecall_010_SuicideEnd_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "ec8403c0c5ed7f585dc9f9e0b09a3c70dd0ced038cef009df8e1d69437c7405e",
-                    "mixHash" : "0f889d1300e22efd5ccde5dde100c87f3502b7c7cafb76b9d5c59bd26cd078cb",
-                    "nonce" : "5c2db8828fe50f96",
+                    "hash" : "0x5c0bab4164d7abf70d93cfbacdcf34cca7ab0c0ae62db1d79ce40194ef1107ef",
+                    "mixHash" : "0xb73841ed3eaaf089a576ce9fc3ee64c54441e3c7adb332eba01755ba1e234107",
+                    "nonce" : "0xbd21a2b70a67f373",
                     "number" : "0x01",
-                    "parentHash" : "3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
-                    "receiptTrie" : "5ddf1b8d5475614bd8beb33dd7cb335730a4aa379ebaa01771ff2f9643ed7fde",
-                    "stateRoot" : "a04a7bf5b8fc73a6cafc6ca76c47870966136a13e8ecc2289a0fb546fbc3a204",
+                    "parentHash" : "0x3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
+                    "receiptTrie" : "0x5ddf1b8d5475614bd8beb33dd7cb335730a4aa379ebaa01771ff2f9643ed7fde",
+                    "stateRoot" : "0xa04a7bf5b8fc73a6cafc6ca76c47870966136a13e8ecc2289a0fb546fbc3a204",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a03dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a04a7bf5b8fc73a6cafc6ca76c47870966136a13e8ecc2289a0fb546fbc3a204a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05ddf1b8d5475614bd8beb33dd7cb335730a4aa379ebaa01771ff2f9643ed7fdeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a00f889d1300e22efd5ccde5dde100c87f3502b7c7cafb76b9d5c59bd26cd078cb885c2db8828fe50f96f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a03dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a04a7bf5b8fc73a6cafc6ca76c47870966136a13e8ecc2289a0fb546fbc3a204a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05ddf1b8d5475614bd8beb33dd7cb335730a4aa379ebaa01771ff2f9643ed7fdeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0b73841ed3eaaf089a576ce9fc3ee64c54441e3c7adb332eba01755ba1e23410788bd21a2b70a67f373f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a8b0db9be9e338f626cb9eb9edbf5ea808e5bdf4d6ada0f7799d3799e04925af",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa8b0db9be9e338f626cb9eb9edbf5ea808e5bdf4d6ada0f7799d3799e04925af",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8b0db9be9e338f626cb9eb9edbf5ea808e5bdf4d6ada0f7799d3799e04925afa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ec8403c0c5ed7f585dc9f9e0b09a3c70dd0ced038cef009df8e1d69437c7405e",
+        "lastblockhash" : "0x5c0bab4164d7abf70d93cfbacdcf34cca7ab0c0ae62db1d79ce40194ef1107ef",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -68,14 +73,14 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
@@ -83,53 +88,53 @@
                     "0x03" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f548e7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762b719",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -137,36 +142,41 @@
         }
     },
     "callcallcodecall_010_SuicideEnd_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "a55956070e9cc9d581ad930ea84eab3114992de72b572371456cfee3b577dc63",
-                    "mixHash" : "26f4383dec5459cb65585d3f650218ecbafd856fa9b26ac61854846c518ce3d7",
-                    "nonce" : "bba9e7e5876349e2",
+                    "hash" : "0xedc352d2d4405b7f4a634157de4c551a5f4f146024c688ab875aa1d93863d43c",
+                    "mixHash" : "0x428918992263e558a44be46995004bc490b0b101438809734f7b87681e4d7e1b",
+                    "nonce" : "0xdac07b3535c13ed7",
                     "number" : "0x01",
-                    "parentHash" : "3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
-                    "receiptTrie" : "5ddf1b8d5475614bd8beb33dd7cb335730a4aa379ebaa01771ff2f9643ed7fde",
-                    "stateRoot" : "a04a7bf5b8fc73a6cafc6ca76c47870966136a13e8ecc2289a0fb546fbc3a204",
+                    "parentHash" : "0x3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
+                    "receiptTrie" : "0x5ddf1b8d5475614bd8beb33dd7cb335730a4aa379ebaa01771ff2f9643ed7fde",
+                    "stateRoot" : "0xa04a7bf5b8fc73a6cafc6ca76c47870966136a13e8ecc2289a0fb546fbc3a204",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a03dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a04a7bf5b8fc73a6cafc6ca76c47870966136a13e8ecc2289a0fb546fbc3a204a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05ddf1b8d5475614bd8beb33dd7cb335730a4aa379ebaa01771ff2f9643ed7fdeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a026f4383dec5459cb65585d3f650218ecbafd856fa9b26ac61854846c518ce3d788bba9e7e5876349e2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a03dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a04a7bf5b8fc73a6cafc6ca76c47870966136a13e8ecc2289a0fb546fbc3a204a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05ddf1b8d5475614bd8beb33dd7cb335730a4aa379ebaa01771ff2f9643ed7fdeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0428918992263e558a44be46995004bc490b0b101438809734f7b87681e4d7e1b88dac07b3535c13ed7f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -176,28 +186,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a8b0db9be9e338f626cb9eb9edbf5ea808e5bdf4d6ada0f7799d3799e04925af",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa8b0db9be9e338f626cb9eb9edbf5ea808e5bdf4d6ada0f7799d3799e04925af",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8b0db9be9e338f626cb9eb9edbf5ea808e5bdf4d6ada0f7799d3799e04925afa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a55956070e9cc9d581ad930ea84eab3114992de72b572371456cfee3b577dc63",
+        "lastblockhash" : "0xedc352d2d4405b7f4a634157de4c551a5f4f146024c688ab875aa1d93863d43c",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -205,14 +215,14 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
@@ -220,53 +230,53 @@
                     "0x03" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f548e7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762b719",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -274,36 +284,41 @@
         }
     },
     "callcallcodecall_010_SuicideEnd_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "fef089493194cd63adcd7258f84827f9cae464a3fa8d7cf8cfdcc10a6f91544a",
-                    "mixHash" : "b7fd41c4ecc1b81dd7f28586381cf2183fd4f20be9c7f4b9735c7cf3477616af",
-                    "nonce" : "083fcae0605b5ce9",
+                    "hash" : "0xa0993c1d12fa2a74d5dad2273bd9df02c91474d6fe5924f5210fff1ca5e4f745",
+                    "mixHash" : "0xd8c8e0f47715a68adef3fb2ebc1bb1df985ea591223f45407133d00a9b13821c",
+                    "nonce" : "0xfb0336b34deb28f8",
                     "number" : "0x01",
-                    "parentHash" : "3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
-                    "receiptTrie" : "d0894e5a5b418948c955033acb4a3a4c93d7e9afebff28fee033f0e632e3f37c",
-                    "stateRoot" : "502bf863134ad7c068442765a3d5dd072efd0ff3ab8c92267fcc580640ce8498",
+                    "parentHash" : "0x3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
+                    "receiptTrie" : "0xd0894e5a5b418948c955033acb4a3a4c93d7e9afebff28fee033f0e632e3f37c",
+                    "stateRoot" : "0x502bf863134ad7c068442765a3d5dd072efd0ff3ab8c92267fcc580640ce8498",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a03dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0502bf863134ad7c068442765a3d5dd072efd0ff3ab8c92267fcc580640ce8498a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d0894e5a5b418948c955033acb4a3a4c93d7e9afebff28fee033f0e632e3f37cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0b7fd41c4ecc1b81dd7f28586381cf2183fd4f20be9c7f4b9735c7cf3477616af88083fcae0605b5ce9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a03dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0502bf863134ad7c068442765a3d5dd072efd0ff3ab8c92267fcc580640ce8498a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d0894e5a5b418948c955033acb4a3a4c93d7e9afebff28fee033f0e632e3f37cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0d8c8e0f47715a68adef3fb2ebc1bb1df985ea591223f45407133d00a9b13821c88fb0336b34deb28f8f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -313,28 +328,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a8b0db9be9e338f626cb9eb9edbf5ea808e5bdf4d6ada0f7799d3799e04925af",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa8b0db9be9e338f626cb9eb9edbf5ea808e5bdf4d6ada0f7799d3799e04925af",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8b0db9be9e338f626cb9eb9edbf5ea808e5bdf4d6ada0f7799d3799e04925afa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "fef089493194cd63adcd7258f84827f9cae464a3fa8d7cf8cfdcc10a6f91544a",
+        "lastblockhash" : "0xa0993c1d12fa2a74d5dad2273bd9df02c91474d6fe5924f5210fff1ca5e4f745",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -342,14 +357,14 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
@@ -357,53 +372,53 @@
                     "0x03" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52da3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762d25d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -411,36 +426,41 @@
         }
     },
     "callcallcodecall_010_SuicideEnd_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "ee57fbd6656535341b3492f61f1a40d5f0fcfb7df332e9c3eac26eaa3af1c52e",
-                    "mixHash" : "2f44696e88497d306cc0a626d65d2eedaccecbdaf5de93f3d8f5875832b0d4b0",
-                    "nonce" : "bf0995aa0c7326d5",
+                    "hash" : "0x1626362fea28b6a395d3dda2e5fcb4e188d659ce27b674974bdb0d005f5ee3c2",
+                    "mixHash" : "0x162bdc86aa373a3abd9dfd7f3fcaa0de338a4619a02c344cee04b13ec38f0f32",
+                    "nonce" : "0x70624fa84ccb5fad",
                     "number" : "0x01",
-                    "parentHash" : "3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
-                    "receiptTrie" : "d0894e5a5b418948c955033acb4a3a4c93d7e9afebff28fee033f0e632e3f37c",
-                    "stateRoot" : "502bf863134ad7c068442765a3d5dd072efd0ff3ab8c92267fcc580640ce8498",
+                    "parentHash" : "0x3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
+                    "receiptTrie" : "0xd0894e5a5b418948c955033acb4a3a4c93d7e9afebff28fee033f0e632e3f37c",
+                    "stateRoot" : "0x502bf863134ad7c068442765a3d5dd072efd0ff3ab8c92267fcc580640ce8498",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a03dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0502bf863134ad7c068442765a3d5dd072efd0ff3ab8c92267fcc580640ce8498a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d0894e5a5b418948c955033acb4a3a4c93d7e9afebff28fee033f0e632e3f37cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a02f44696e88497d306cc0a626d65d2eedaccecbdaf5de93f3d8f5875832b0d4b088bf0995aa0c7326d5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a03dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0502bf863134ad7c068442765a3d5dd072efd0ff3ab8c92267fcc580640ce8498a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d0894e5a5b418948c955033acb4a3a4c93d7e9afebff28fee033f0e632e3f37cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0162bdc86aa373a3abd9dfd7f3fcaa0de338a4619a02c344cee04b13ec38f0f328870624fa84ccb5fadf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -450,28 +470,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a8b0db9be9e338f626cb9eb9edbf5ea808e5bdf4d6ada0f7799d3799e04925af",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa8b0db9be9e338f626cb9eb9edbf5ea808e5bdf4d6ada0f7799d3799e04925af",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8b0db9be9e338f626cb9eb9edbf5ea808e5bdf4d6ada0f7799d3799e04925afa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ee57fbd6656535341b3492f61f1a40d5f0fcfb7df332e9c3eac26eaa3af1c52e",
+        "lastblockhash" : "0x1626362fea28b6a395d3dda2e5fcb4e188d659ce27b674974bdb0d005f5ee3c2",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -479,14 +499,14 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
@@ -494,53 +514,202 @@
                     "0x03" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52da3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762d25d",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x4c6ff75b1c08c122c6efe57d4d30b5922b98e37ae0e1c66e77a74126ca68f9ce",
+                    "mixHash" : "0x09f4808624f0dce2ec51873f0bf6f497bc6dbc3817fc670988914f2d2d4baac4",
+                    "nonce" : "0xb2f75c41482fdb26",
+                    "number" : "0x01",
+                    "parentHash" : "0x3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0xe6db8e9be16198fd595e06ba781853f0879ffc1cf4ebff4ac85b7fc1742fc519",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a03dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e6db8e9be16198fd595e06ba781853f0879ffc1cf4ebff4ac85b7fc1742fc519a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a009f4808624f0dce2ec51873f0bf6f497bc6dbc3817fc670988914f2d2d4baac488b2f75c41482fdb26f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x4c6ff75b1c08c122c6efe57d4d30b5922b98e37ae0e1c66e77a74126ca68f9ce",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle.json
deleted file mode 100644
index bdd3230f8..000000000
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle.json
+++ /dev/null
@@ -1,546 +0,0 @@
-{
-    "callcallcodecall_010_SuicideMiddle_d0g0v0_EIP150" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c7",
-                    "hash" : "c679e4f6ba374b0f2e6f09629e273b3f777498794adb69a07cede82ff6eceb0e",
-                    "mixHash" : "5dbf8dacd855bc587b8571a98bcc16386a0906d220d93bb6855a1624adeaca0c",
-                    "nonce" : "16899c25e1046156",
-                    "number" : "0x01",
-                    "parentHash" : "8cfd3558d38b06992cc50626901e59524a9b656510b12867133632a3da926b35",
-                    "receiptTrie" : "554cc1aa06dabbae7465c21c5ad34eb7cdb46b23d9e0c10c82ce1869915663cf",
-                    "stateRoot" : "c9abb2ac1376d549ddf0701b8a68b4fbba6e53651287f68c1c01189f7824814f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a08cfd3558d38b06992cc50626901e59524a9b656510b12867133632a3da926b35a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c9abb2ac1376d549ddf0701b8a68b4fbba6e53651287f68c1c01189f7824814fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0554cc1aa06dabbae7465c21c5ad34eb7cdb46b23d9e0c10c82ce1869915663cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a05dbf8dacd855bc587b8571a98bcc16386a0906d220d93bb6855a1624adeaca0c8816899c25e1046156f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "8cfd3558d38b06992cc50626901e59524a9b656510b12867133632a3da926b35",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7c5aee7943744e804a242c9569503b69491a2a680383b5a8b1e38409765cd9b5",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c5aee7943744e804a242c9569503b69491a2a680383b5a8b1e38409765cd9b5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c679e4f6ba374b0f2e6f09629e273b3f777498794adb69a07cede82ff6eceb0e",
-        "network" : "EIP150",
-        "postState" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635639",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcodecall_010_SuicideMiddle_d0g0v0_EIP158" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c7",
-                    "hash" : "4f7e905abeee7c42fa7f8c3769c67cf11f6ea4fc98ea2b5efe3ec57713464464",
-                    "mixHash" : "ce70be925060b771493488f861265d029a79067ffbd47f698e4ae2682ee3212f",
-                    "nonce" : "31e875656f0d94b3",
-                    "number" : "0x01",
-                    "parentHash" : "8cfd3558d38b06992cc50626901e59524a9b656510b12867133632a3da926b35",
-                    "receiptTrie" : "554cc1aa06dabbae7465c21c5ad34eb7cdb46b23d9e0c10c82ce1869915663cf",
-                    "stateRoot" : "c9abb2ac1376d549ddf0701b8a68b4fbba6e53651287f68c1c01189f7824814f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a08cfd3558d38b06992cc50626901e59524a9b656510b12867133632a3da926b35a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c9abb2ac1376d549ddf0701b8a68b4fbba6e53651287f68c1c01189f7824814fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0554cc1aa06dabbae7465c21c5ad34eb7cdb46b23d9e0c10c82ce1869915663cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0ce70be925060b771493488f861265d029a79067ffbd47f698e4ae2682ee3212f8831e875656f0d94b3f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "8cfd3558d38b06992cc50626901e59524a9b656510b12867133632a3da926b35",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7c5aee7943744e804a242c9569503b69491a2a680383b5a8b1e38409765cd9b5",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c5aee7943744e804a242c9569503b69491a2a680383b5a8b1e38409765cd9b5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4f7e905abeee7c42fa7f8c3769c67cf11f6ea4fc98ea2b5efe3ec57713464464",
-        "network" : "EIP158",
-        "postState" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635639",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcodecall_010_SuicideMiddle_d0g0v0_Frontier" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9117",
-                    "hash" : "06ca5c02b1e50a6bba6de3f8e40da51b1cbe1ebe47f02231ca8986a30d3c36d1",
-                    "mixHash" : "881ee189a8ddbb2fdc435692a291a19696750a28c26af5854e3b084fe148269e",
-                    "nonce" : "404c7c312868d4ac",
-                    "number" : "0x01",
-                    "parentHash" : "8cfd3558d38b06992cc50626901e59524a9b656510b12867133632a3da926b35",
-                    "receiptTrie" : "666ecb6624a85f97eeec5d50c3c7504bf38e8259a64cd46a949a5588a592b324",
-                    "stateRoot" : "5dd197551f07421f3cd316391a17feaea2856a0d4315cab17483985557f16e57",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a08cfd3558d38b06992cc50626901e59524a9b656510b12867133632a3da926b35a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05dd197551f07421f3cd316391a17feaea2856a0d4315cab17483985557f16e57a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0666ecb6624a85f97eeec5d50c3c7504bf38e8259a64cd46a949a5588a592b324b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0881ee189a8ddbb2fdc435692a291a19696750a28c26af5854e3b084fe148269e88404c7c312868d4acf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "8cfd3558d38b06992cc50626901e59524a9b656510b12867133632a3da926b35",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7c5aee7943744e804a242c9569503b69491a2a680383b5a8b1e38409765cd9b5",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c5aee7943744e804a242c9569503b69491a2a680383b5a8b1e38409765cd9b5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "06ca5c02b1e50a6bba6de3f8e40da51b1cbe1ebe47f02231ca8986a30d3c36d1",
-        "network" : "Frontier",
-        "postState" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49117",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636ee9",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcodecall_010_SuicideMiddle_d0g0v0_Homestead" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9117",
-                    "hash" : "7518db915d869ab3ca25111afbc88cd271ed10b1f6802963ed9102d5cea34303",
-                    "mixHash" : "5839bef0777b2f7475e6c9ac9abaa23b90b9df6b8e04455ed1788b89d9549eef",
-                    "nonce" : "45abb5889631497b",
-                    "number" : "0x01",
-                    "parentHash" : "8cfd3558d38b06992cc50626901e59524a9b656510b12867133632a3da926b35",
-                    "receiptTrie" : "666ecb6624a85f97eeec5d50c3c7504bf38e8259a64cd46a949a5588a592b324",
-                    "stateRoot" : "5dd197551f07421f3cd316391a17feaea2856a0d4315cab17483985557f16e57",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a08cfd3558d38b06992cc50626901e59524a9b656510b12867133632a3da926b35a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05dd197551f07421f3cd316391a17feaea2856a0d4315cab17483985557f16e57a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0666ecb6624a85f97eeec5d50c3c7504bf38e8259a64cd46a949a5588a592b324b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a05839bef0777b2f7475e6c9ac9abaa23b90b9df6b8e04455ed1788b89d9549eef8845abb5889631497bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "8cfd3558d38b06992cc50626901e59524a9b656510b12867133632a3da926b35",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7c5aee7943744e804a242c9569503b69491a2a680383b5a8b1e38409765cd9b5",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c5aee7943744e804a242c9569503b69491a2a680383b5a8b1e38409765cd9b5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7518db915d869ab3ca25111afbc88cd271ed10b1f6802963ed9102d5cea34303",
-        "network" : "Homestead",
-        "postState" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49117",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636ee9",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle_d0g0v0.json
new file mode 100644
index 000000000..805415f8e
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle_d0g0v0.json
@@ -0,0 +1,714 @@
+{
+    "callcallcodecall_010_SuicideMiddle_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xe26f795191a37b6f2fbfbea6d7f739f6edb7337fcbc42e1b40a8dedb5b41c8c6",
+                    "mixHash" : "0xdd4d138feaf240bf55dcc8b3d47005e2d267f4b54276f49fdf532a79f2012ee1",
+                    "nonce" : "0x1aabcc53e10596d9",
+                    "number" : "0x01",
+                    "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
+                    "receiptTrie" : "0x40d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51",
+                    "stateRoot" : "0x76de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0dd4d138feaf240bf55dcc8b3d47005e2d267f4b54276f49fdf532a79f2012ee1881aabcc53e10596d9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xe26f795191a37b6f2fbfbea6d7f739f6edb7337fcbc42e1b40a8dedb5b41c8c6",
+        "network" : "EIP150",
+        "postState" : {
+            "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_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x5a7e4d51f9a76ddfbeac5d6c4b5fe2b7d24f2565191321103c19680839bb6d7a",
+                    "mixHash" : "0x2ff381fe302386ca42013f28c719c2fc03537676deff999504dc7386daf942fa",
+                    "nonce" : "0x2606e77b22ebaab4",
+                    "number" : "0x01",
+                    "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
+                    "receiptTrie" : "0x40d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51",
+                    "stateRoot" : "0x76de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a02ff381fe302386ca42013f28c719c2fc03537676deff999504dc7386daf942fa882606e77b22ebaab4f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x5a7e4d51f9a76ddfbeac5d6c4b5fe2b7d24f2565191321103c19680839bb6d7a",
+        "network" : "EIP158",
+        "postState" : {
+            "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_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x9117",
+                    "hash" : "0x2bb3104438b3f084c360a0157cd888df0d2abc97ebdb249e42cb2b019b70572b",
+                    "mixHash" : "0x12f1e511e0d978c300c771188102673b2fdfe8571c3a6b8cb07e60b1bad06996",
+                    "nonce" : "0x66f9d4ed40e8ddaf",
+                    "number" : "0x01",
+                    "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
+                    "receiptTrie" : "0xc8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06b",
+                    "stateRoot" : "0xb31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a012f1e511e0d978c300c771188102673b2fdfe8571c3a6b8cb07e60b1bad069968866f9d4ed40e8ddaff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x2bb3104438b3f084c360a0157cd888df0d2abc97ebdb249e42cb2b019b70572b",
+        "network" : "Frontier",
+        "postState" : {
+            "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" : "0x4563918244f49117",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7636ee9",
+                "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_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x9117",
+                    "hash" : "0x09b20cccb302f45fb9403f8377643554ef1e31d25b7472d8489df09bd3a78e89",
+                    "mixHash" : "0xc0ab53333aeab9fcf1086e1f23544f3409fc59f10354529543a9d50ce700c5e9",
+                    "nonce" : "0x25797daf38250b9a",
+                    "number" : "0x01",
+                    "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
+                    "receiptTrie" : "0xc8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06b",
+                    "stateRoot" : "0xb31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0c0ab53333aeab9fcf1086e1f23544f3409fc59f10354529543a9d50ce700c5e98825797daf38250b9af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x09b20cccb302f45fb9403f8377643554ef1e31d25b7472d8489df09bd3a78e89",
+        "network" : "Homestead",
+        "postState" : {
+            "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" : "0x4563918244f49117",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7636ee9",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xc7ce3ac74d407507a64473e1d82a0ca4c7cd19d98383aded5d6812ee2cec85b7",
+                    "mixHash" : "0xd898bed68f99dc1e667491065e08ac7ab3236ac11f7b5177822c941dc7711a65",
+                    "nonce" : "0x42ca72599576aa4b",
+                    "number" : "0x01",
+                    "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x39f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0d898bed68f99dc1e667491065e08ac7ab3236ac11f7b5177822c941dc7711a658842ca72599576aa4bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xc7ce3ac74d407507a64473e1d82a0ca4c7cd19d98383aded5d6812ee2cec85b7",
+        "network" : "Metropolis",
+        "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" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_d0g0v0.json
index e0c3b92b3..581a3bece 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcodecall_010_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "580722c0df6efcc83b152815488f230be5471e7ccb78792ffd311b1097fb3bd6",
-                    "mixHash" : "e46078726ec6a7ba606e617b7aca28a5048ce194f48129cd6b0574b3389e93c7",
-                    "nonce" : "3b674b85ec96f6ae",
+                    "hash" : "0xa557b8f863178ddd0d3e53a53f58b3b5e0ba58cb384f0e7d008d808a7650a686",
+                    "mixHash" : "0xc7a57b5a288351ea4be4f5044cbc92c6f5831ea659d703789ede2b9dc1802917",
+                    "nonce" : "0x7eedc01144ba61e5",
                     "number" : "0x01",
-                    "parentHash" : "0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
-                    "receiptTrie" : "263bb47e7b4b74da3ab4b24c805e86c6b48e7b68b8bd3cb756a2dc97ddf2e2d2",
-                    "stateRoot" : "698e670a1c444b8cd91d9e5362c042389708c0f2fae24ec13420d8078fb2a0b3",
+                    "parentHash" : "0x0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
+                    "receiptTrie" : "0x263bb47e7b4b74da3ab4b24c805e86c6b48e7b68b8bd3cb756a2dc97ddf2e2d2",
+                    "stateRoot" : "0x698e670a1c444b8cd91d9e5362c042389708c0f2fae24ec13420d8078fb2a0b3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0698e670a1c444b8cd91d9e5362c042389708c0f2fae24ec13420d8078fb2a0b3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0263bb47e7b4b74da3ab4b24c805e86c6b48e7b68b8bd3cb756a2dc97ddf2e2d2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0e46078726ec6a7ba606e617b7aca28a5048ce194f48129cd6b0574b3389e93c7883b674b85ec96f6aef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a00b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0698e670a1c444b8cd91d9e5362c042389708c0f2fae24ec13420d8078fb2a0b3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0263bb47e7b4b74da3ab4b24c805e86c6b48e7b68b8bd3cb756a2dc97ddf2e2d2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0c7a57b5a288351ea4be4f5044cbc92c6f5831ea659d703789ede2b9dc1802917887eedc01144ba61e5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1d585f2dca5b231004260da91ccb1c5175403c18f1a9acad558a03550ede95ce",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1d585f2dca5b231004260da91ccb1c5175403c18f1a9acad558a03550ede95ce",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d585f2dca5b231004260da91ccb1c5175403c18f1a9acad558a03550ede95cea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "580722c0df6efcc83b152815488f230be5471e7ccb78792ffd311b1097fb3bd6",
+        "lastblockhash" : "0xa557b8f863178ddd0d3e53a53f58b3b5e0ba58cb384f0e7d008d808a7650a686",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
@@ -77,14 +82,14 @@
                     "0x02" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x03",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
@@ -99,53 +104,53 @@
                     "0x07" : "0x03"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f804a3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ffb5d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -153,36 +158,41 @@
         }
     },
     "callcallcodecall_010_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "bf12705982b759c5732dc2458f33eba1b30417f98dcca35f34d0e3bbd14eb676",
-                    "mixHash" : "be055db3d72a5b5a1a92ca556dbc83c794ffdc1f6105730e03ec858cfbe4c88d",
-                    "nonce" : "b666270e07b2f220",
+                    "hash" : "0x0aaccc8d008150deed8c1ab8765d6d29ff0bd72a970be72564eb6887959b2f75",
+                    "mixHash" : "0xa3852889d02ae5f646b23dc25bbc2698564ed53c21880a9e8a8e1021dd65c02a",
+                    "nonce" : "0x0a87e2726d13739f",
                     "number" : "0x01",
-                    "parentHash" : "0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
-                    "receiptTrie" : "263bb47e7b4b74da3ab4b24c805e86c6b48e7b68b8bd3cb756a2dc97ddf2e2d2",
-                    "stateRoot" : "698e670a1c444b8cd91d9e5362c042389708c0f2fae24ec13420d8078fb2a0b3",
+                    "parentHash" : "0x0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
+                    "receiptTrie" : "0x263bb47e7b4b74da3ab4b24c805e86c6b48e7b68b8bd3cb756a2dc97ddf2e2d2",
+                    "stateRoot" : "0x698e670a1c444b8cd91d9e5362c042389708c0f2fae24ec13420d8078fb2a0b3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0698e670a1c444b8cd91d9e5362c042389708c0f2fae24ec13420d8078fb2a0b3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0263bb47e7b4b74da3ab4b24c805e86c6b48e7b68b8bd3cb756a2dc97ddf2e2d2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0be055db3d72a5b5a1a92ca556dbc83c794ffdc1f6105730e03ec858cfbe4c88d88b666270e07b2f220f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a00b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0698e670a1c444b8cd91d9e5362c042389708c0f2fae24ec13420d8078fb2a0b3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0263bb47e7b4b74da3ab4b24c805e86c6b48e7b68b8bd3cb756a2dc97ddf2e2d2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0a3852889d02ae5f646b23dc25bbc2698564ed53c21880a9e8a8e1021dd65c02a880a87e2726d13739ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -192,28 +202,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1d585f2dca5b231004260da91ccb1c5175403c18f1a9acad558a03550ede95ce",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1d585f2dca5b231004260da91ccb1c5175403c18f1a9acad558a03550ede95ce",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d585f2dca5b231004260da91ccb1c5175403c18f1a9acad558a03550ede95cea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "bf12705982b759c5732dc2458f33eba1b30417f98dcca35f34d0e3bbd14eb676",
+        "lastblockhash" : "0x0aaccc8d008150deed8c1ab8765d6d29ff0bd72a970be72564eb6887959b2f75",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -221,7 +231,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
@@ -230,14 +240,14 @@
                     "0x02" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x03",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
@@ -252,53 +262,53 @@
                     "0x07" : "0x03"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f804a3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ffb5d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -306,36 +316,41 @@
         }
     },
     "callcallcodecall_010_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "3162c48a06bc27d1adfc826e2be1ad73d0eac2162b06f989da8fdb5f427c1755",
-                    "mixHash" : "e04e6110fa04f5324bf9236027185f583a5e4009c579411f464717e370f8f847",
-                    "nonce" : "d9076eaea3f78a58",
+                    "hash" : "0xac7d3665c56063de8a7e69108cb5913448bbb124a7ec5d3bdb8abf02cdbe772b",
+                    "mixHash" : "0xa94de744aa2ca75920f462f8cda2f8a4b79d3d8dc02dae704f2e5a4968bc0765",
+                    "nonce" : "0xe1d83fb6d67968ed",
                     "number" : "0x01",
-                    "parentHash" : "0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
-                    "receiptTrie" : "076c3090b7194dc1fe99c4bc2f91ea4baab7d1ae64315be0612cba2c7e4e8c81",
-                    "stateRoot" : "b840be4f896a13d47fa2946cb8d8444ddd7475c1e0536be1cde36412b9e0abeb",
+                    "parentHash" : "0x0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
+                    "receiptTrie" : "0x076c3090b7194dc1fe99c4bc2f91ea4baab7d1ae64315be0612cba2c7e4e8c81",
+                    "stateRoot" : "0xb840be4f896a13d47fa2946cb8d8444ddd7475c1e0536be1cde36412b9e0abeb",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b840be4f896a13d47fa2946cb8d8444ddd7475c1e0536be1cde36412b9e0abeba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0076c3090b7194dc1fe99c4bc2f91ea4baab7d1ae64315be0612cba2c7e4e8c81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0e04e6110fa04f5324bf9236027185f583a5e4009c579411f464717e370f8f84788d9076eaea3f78a58f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a00b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b840be4f896a13d47fa2946cb8d8444ddd7475c1e0536be1cde36412b9e0abeba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0076c3090b7194dc1fe99c4bc2f91ea4baab7d1ae64315be0612cba2c7e4e8c81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0a94de744aa2ca75920f462f8cda2f8a4b79d3d8dc02dae704f2e5a4968bc076588e1d83fb6d67968edf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -345,28 +360,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1d585f2dca5b231004260da91ccb1c5175403c18f1a9acad558a03550ede95ce",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1d585f2dca5b231004260da91ccb1c5175403c18f1a9acad558a03550ede95ce",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d585f2dca5b231004260da91ccb1c5175403c18f1a9acad558a03550ede95cea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3162c48a06bc27d1adfc826e2be1ad73d0eac2162b06f989da8fdb5f427c1755",
+        "lastblockhash" : "0xac7d3665c56063de8a7e69108cb5913448bbb124a7ec5d3bdb8abf02cdbe772b",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -374,7 +389,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
@@ -383,14 +398,14 @@
                     "0x02" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x03",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
@@ -405,53 +420,53 @@
                     "0x07" : "0x03"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7fce7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7600319",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -459,36 +474,41 @@
         }
     },
     "callcallcodecall_010_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "60964cef612c8a68607afb01d303cc3b0d93a3d92ee28b9fc369f1bb1861823a",
-                    "mixHash" : "375020d84a09861a8cc2a43485ba8fbc872082b5c6bd77fe623585c239a9d1b9",
-                    "nonce" : "8012f642c5eca3be",
+                    "hash" : "0xdf7abfdda0a971c9e790bd6de3569432090137c891a52f657e4651d49e18c1e8",
+                    "mixHash" : "0xed082295e122993ddfbdb7b6d4f095e181ac59322612e1aab859e01a8b54f3ff",
+                    "nonce" : "0x101f1662a58cccf5",
                     "number" : "0x01",
-                    "parentHash" : "0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
-                    "receiptTrie" : "076c3090b7194dc1fe99c4bc2f91ea4baab7d1ae64315be0612cba2c7e4e8c81",
-                    "stateRoot" : "b840be4f896a13d47fa2946cb8d8444ddd7475c1e0536be1cde36412b9e0abeb",
+                    "parentHash" : "0x0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
+                    "receiptTrie" : "0x076c3090b7194dc1fe99c4bc2f91ea4baab7d1ae64315be0612cba2c7e4e8c81",
+                    "stateRoot" : "0xb840be4f896a13d47fa2946cb8d8444ddd7475c1e0536be1cde36412b9e0abeb",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b840be4f896a13d47fa2946cb8d8444ddd7475c1e0536be1cde36412b9e0abeba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0076c3090b7194dc1fe99c4bc2f91ea4baab7d1ae64315be0612cba2c7e4e8c81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0375020d84a09861a8cc2a43485ba8fbc872082b5c6bd77fe623585c239a9d1b9888012f642c5eca3bef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a00b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b840be4f896a13d47fa2946cb8d8444ddd7475c1e0536be1cde36412b9e0abeba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0076c3090b7194dc1fe99c4bc2f91ea4baab7d1ae64315be0612cba2c7e4e8c81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0ed082295e122993ddfbdb7b6d4f095e181ac59322612e1aab859e01a8b54f3ff88101f1662a58cccf5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -498,28 +518,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1d585f2dca5b231004260da91ccb1c5175403c18f1a9acad558a03550ede95ce",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1d585f2dca5b231004260da91ccb1c5175403c18f1a9acad558a03550ede95ce",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d585f2dca5b231004260da91ccb1c5175403c18f1a9acad558a03550ede95cea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "60964cef612c8a68607afb01d303cc3b0d93a3d92ee28b9fc369f1bb1861823a",
+        "lastblockhash" : "0xdf7abfdda0a971c9e790bd6de3569432090137c891a52f657e4651d49e18c1e8",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -527,7 +547,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
@@ -536,14 +556,14 @@
                     "0x02" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x03",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
@@ -558,53 +578,218 @@
                     "0x07" : "0x03"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7fce7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7600319",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0x2eba445211ae32e318cfd5cbc74e038362dbd5452c600492f2e981e42d664fc0",
+                    "mixHash" : "0xa2ee12011884dc33836955ace390a94a3c126cdc0e80838a4d4b76d24b43ae7f",
+                    "nonce" : "0xbf1b74f080e01176",
+                    "number" : "0x01",
+                    "parentHash" : "0x0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0x75a5187a022e4a9c96f99c0ecb155094f1880f9b2c6e4a437229db1c8e855f60",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a00b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa075a5187a022e4a9c96f99c0ecb155094f1880f9b2c6e4a437229db1c8e855f60a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0a2ee12011884dc33836955ace390a94a3c126cdc0e80838a4d4b76d24b43ae7f88bf1b74f080e01176f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x2eba445211ae32e318cfd5cbc74e038362dbd5452c600492f2e981e42d664fc0",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE_d0g0v0.json
index 6b79c9620..c67045fcb 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcodecall_ABCB_RECURSIVE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "f1c961018c355fe1f73b68e949058e022a2893c2dd2e29993ba5241f2257d37d",
-                    "mixHash" : "f45bc2eeb0c1de50ec1f2b532d3291452c8a64b1a8b17828ccda100e099cb391",
-                    "nonce" : "0c045504962d46ae",
+                    "hash" : "0x75664c2f023d074e29f929f5cc7126d7b6ff97f813480195aacca27f1e5d8066",
+                    "mixHash" : "0x11594c594c9f8a07bee1c54175db063efe53682b5002c3e5a2617d415e43a5b1",
+                    "nonce" : "0x10403bae0b70d80f",
                     "number" : "0x01",
-                    "parentHash" : "fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
-                    "receiptTrie" : "38f9bf3bdda1e331855a1507ca1ac29a0d8746d19080b9f1e0288a65b616c255",
-                    "stateRoot" : "df5f4e6310bac9434e164011e9c1215ee983f3a14008212d1df08b39c3a3d309",
+                    "parentHash" : "0xfc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
+                    "receiptTrie" : "0x38f9bf3bdda1e331855a1507ca1ac29a0d8746d19080b9f1e0288a65b616c255",
+                    "stateRoot" : "0xdf5f4e6310bac9434e164011e9c1215ee983f3a14008212d1df08b39c3a3d309",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df5f4e6310bac9434e164011e9c1215ee983f3a14008212d1df08b39c3a3d309a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a038f9bf3bdda1e331855a1507ca1ac29a0d8746d19080b9f1e0288a65b616c255b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0f45bc2eeb0c1de50ec1f2b532d3291452c8a64b1a8b17828ccda100e099cb391880c045504962d46aef863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df5f4e6310bac9434e164011e9c1215ee983f3a14008212d1df08b39c3a3d309a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a038f9bf3bdda1e331855a1507ca1ac29a0d8746d19080b9f1e0288a65b616c255b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a011594c594c9f8a07bee1c54175db063efe53682b5002c3e5a2617d415e43a5b18810403bae0b70d80ff863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xfc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b8b1736923571f4398d89300e34a354d72451980ffd1660f53362580981f2cf9",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb8b1736923571f4398d89300e34a354d72451980ffd1660f53362580981f2cf9",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8b1736923571f4398d89300e34a354d72451980ffd1660f53362580981f2cf9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f1c961018c355fe1f73b68e949058e022a2893c2dd2e29993ba5241f2257d37d",
+        "lastblockhash" : "0x75664c2f023d074e29f929f5cc7126d7b6ff97f813480195aacca27f1e5d8066",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
@@ -76,53 +81,53 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fcab7e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5482",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -130,36 +135,41 @@
         }
     },
     "callcallcodecall_ABCB_RECURSIVE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "17cba67b0a635efe09320b55fc17e40b2c66bb34863a1799360394d5dca4bb43",
-                    "mixHash" : "888a8eb4a8dc0cffd26dcca65d22389b6f36ee86103526ce2bd4fba9c45afef7",
-                    "nonce" : "8e6745ae0b1e2c5a",
+                    "hash" : "0xe5ab1b1893759414be8f7007501d18a324e4c974da9ef28af4934ca03e29332b",
+                    "mixHash" : "0xcb0817c85e34d27deff14495613ec8edb883c6dc4e813b1df40007f635c38737",
+                    "nonce" : "0xbe0cead9e2e20d34",
                     "number" : "0x01",
-                    "parentHash" : "fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
-                    "receiptTrie" : "38f9bf3bdda1e331855a1507ca1ac29a0d8746d19080b9f1e0288a65b616c255",
-                    "stateRoot" : "df5f4e6310bac9434e164011e9c1215ee983f3a14008212d1df08b39c3a3d309",
+                    "parentHash" : "0xfc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
+                    "receiptTrie" : "0x38f9bf3bdda1e331855a1507ca1ac29a0d8746d19080b9f1e0288a65b616c255",
+                    "stateRoot" : "0xdf5f4e6310bac9434e164011e9c1215ee983f3a14008212d1df08b39c3a3d309",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df5f4e6310bac9434e164011e9c1215ee983f3a14008212d1df08b39c3a3d309a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a038f9bf3bdda1e331855a1507ca1ac29a0d8746d19080b9f1e0288a65b616c255b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0888a8eb4a8dc0cffd26dcca65d22389b6f36ee86103526ce2bd4fba9c45afef7888e6745ae0b1e2c5af863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df5f4e6310bac9434e164011e9c1215ee983f3a14008212d1df08b39c3a3d309a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a038f9bf3bdda1e331855a1507ca1ac29a0d8746d19080b9f1e0288a65b616c255b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0cb0817c85e34d27deff14495613ec8edb883c6dc4e813b1df40007f635c3873788be0cead9e2e20d34f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -169,28 +179,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xfc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b8b1736923571f4398d89300e34a354d72451980ffd1660f53362580981f2cf9",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb8b1736923571f4398d89300e34a354d72451980ffd1660f53362580981f2cf9",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8b1736923571f4398d89300e34a354d72451980ffd1660f53362580981f2cf9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "17cba67b0a635efe09320b55fc17e40b2c66bb34863a1799360394d5dca4bb43",
+        "lastblockhash" : "0xe5ab1b1893759414be8f7007501d18a324e4c974da9ef28af4934ca03e29332b",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
@@ -198,7 +208,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
@@ -206,53 +216,53 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fcab7e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5482",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -260,36 +270,41 @@
         }
     },
     "callcallcodecall_ABCB_RECURSIVE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "5c94f3038e33a9c736a28b970e67f1228cbeb7554bb149b3cc3637b07182a6ba",
-                    "mixHash" : "0db6e975768b37c4813684e040655d7d71da04d304c6fecad3c23cd7a8447585",
-                    "nonce" : "db612d1b3d197cfb",
+                    "hash" : "0x9a410fbd632a5f3f2aced8aed0e30ecccf1291f483657681304f7eb4413345e7",
+                    "mixHash" : "0xa2b9efd5f4522f9a9e254f0313acc3b7e6a8c42fb3e122b7d7fa2feef0bab19b",
+                    "nonce" : "0x4072c7bc290a4161",
                     "number" : "0x01",
-                    "parentHash" : "fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
-                    "receiptTrie" : "d19d63e7da6a8df437a301489043093b28cfe4f3eea14ab9033d1ee98c70631f",
-                    "stateRoot" : "1fd6dfb47efb7e2d94fd33ff4f66be243823d4ad614dacf6bef0a21099b88af8",
+                    "parentHash" : "0xfc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
+                    "receiptTrie" : "0xd19d63e7da6a8df437a301489043093b28cfe4f3eea14ab9033d1ee98c70631f",
+                    "stateRoot" : "0x1fd6dfb47efb7e2d94fd33ff4f66be243823d4ad614dacf6bef0a21099b88af8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fd6dfb47efb7e2d94fd33ff4f66be243823d4ad614dacf6bef0a21099b88af8a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0d19d63e7da6a8df437a301489043093b28cfe4f3eea14ab9033d1ee98c70631fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a00db6e975768b37c4813684e040655d7d71da04d304c6fecad3c23cd7a844758588db612d1b3d197cfbf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fd6dfb47efb7e2d94fd33ff4f66be243823d4ad614dacf6bef0a21099b88af8a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0d19d63e7da6a8df437a301489043093b28cfe4f3eea14ab9033d1ee98c70631fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0a2b9efd5f4522f9a9e254f0313acc3b7e6a8c42fb3e122b7d7fa2feef0bab19b884072c7bc290a4161f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -299,28 +314,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xfc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b8b1736923571f4398d89300e34a354d72451980ffd1660f53362580981f2cf9",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb8b1736923571f4398d89300e34a354d72451980ffd1660f53362580981f2cf9",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8b1736923571f4398d89300e34a354d72451980ffd1660f53362580981f2cf9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "5c94f3038e33a9c736a28b970e67f1228cbeb7554bb149b3cc3637b07182a6ba",
+        "lastblockhash" : "0x9a410fbd632a5f3f2aced8aed0e30ecccf1291f483657681304f7eb4413345e7",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
@@ -328,7 +343,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
@@ -336,53 +351,53 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fca3c2",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5c3e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -390,36 +405,41 @@
         }
     },
     "callcallcodecall_ABCB_RECURSIVE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "843f3fdf1055d6065b9bf81ed6d36d038731e636d190137f00ebb6ff52f48352",
-                    "mixHash" : "6363d3c80f492058d4bbc5247603f78553101b52808188b1b392ba5d11dbd73a",
-                    "nonce" : "88e2280fc09d12f4",
+                    "hash" : "0x6a764bbc540877f863c42a47dd5f163b5601e5ffc5eb22b78e402c1cefb07c3a",
+                    "mixHash" : "0xa2ce359da3cd5cf23185e164bd8e06f4b7237f67976fc5a4fda5bf3fd39995ea",
+                    "nonce" : "0x8e8692c835dcd2b1",
                     "number" : "0x01",
-                    "parentHash" : "fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
-                    "receiptTrie" : "d19d63e7da6a8df437a301489043093b28cfe4f3eea14ab9033d1ee98c70631f",
-                    "stateRoot" : "1fd6dfb47efb7e2d94fd33ff4f66be243823d4ad614dacf6bef0a21099b88af8",
+                    "parentHash" : "0xfc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
+                    "receiptTrie" : "0xd19d63e7da6a8df437a301489043093b28cfe4f3eea14ab9033d1ee98c70631f",
+                    "stateRoot" : "0x1fd6dfb47efb7e2d94fd33ff4f66be243823d4ad614dacf6bef0a21099b88af8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fd6dfb47efb7e2d94fd33ff4f66be243823d4ad614dacf6bef0a21099b88af8a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0d19d63e7da6a8df437a301489043093b28cfe4f3eea14ab9033d1ee98c70631fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a06363d3c80f492058d4bbc5247603f78553101b52808188b1b392ba5d11dbd73a8888e2280fc09d12f4f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fd6dfb47efb7e2d94fd33ff4f66be243823d4ad614dacf6bef0a21099b88af8a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0d19d63e7da6a8df437a301489043093b28cfe4f3eea14ab9033d1ee98c70631fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0a2ce359da3cd5cf23185e164bd8e06f4b7237f67976fc5a4fda5bf3fd39995ea888e8692c835dcd2b1f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -429,28 +449,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xfc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b8b1736923571f4398d89300e34a354d72451980ffd1660f53362580981f2cf9",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb8b1736923571f4398d89300e34a354d72451980ffd1660f53362580981f2cf9",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8b1736923571f4398d89300e34a354d72451980ffd1660f53362580981f2cf9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "843f3fdf1055d6065b9bf81ed6d36d038731e636d190137f00ebb6ff52f48352",
+        "lastblockhash" : "0x6a764bbc540877f863c42a47dd5f163b5601e5ffc5eb22b78e402c1cefb07c3a",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
@@ -458,7 +478,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
@@ -466,53 +486,195 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fca3c2",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5c3e",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x1a1bbe8e843a168e6f59d0d6b9c263dc4356fec0ae80364f06e72b4fa044fdda",
+                    "mixHash" : "0x8528a7cc3b6ce8c01a71437ce2b768c8b02479b0f517a43881e13d0c95e2c127",
+                    "nonce" : "0xb3748b4bd2a2030e",
+                    "number" : "0x01",
+                    "parentHash" : "0xfc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0xeea67a57635964b262d077099b59e9e95d0384d79527fb98256848e49dcbb6d6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eea67a57635964b262d077099b59e9e95d0384d79527fb98256848e49dcbb6d6a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a08528a7cc3b6ce8c01a71437ce2b768c8b02479b0f517a43881e13d0c95e2c12788b3748b4bd2a2030ef863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "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" : "0x1a1bbe8e843a168e6f59d0d6b9c263dc4356fec0ae80364f06e72b4fa044fdda",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE_d0g0v0.json
index bf680d202..1a3ed9815 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcodecallcode_011_OOGE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "9ad06575faad44621cb539dceb00b8eccb5f145f1435365c9b6c26ba3fb5bbe0",
-                    "mixHash" : "b4fe894261cb08d697617e1c232a48034765efcd88848b4d0e433bacc610b73f",
-                    "nonce" : "16c99412343d4972",
+                    "hash" : "0x929e663231aa855b2375253ffe27876d67016f07cc5077fa18f3754c49c44a7f",
+                    "mixHash" : "0xf3ccf0308ed5e99da4934adac6107fbbfe8ee8c71d260276849cf45a5e519ffb",
+                    "nonce" : "0x840cb5c7ff267178",
                     "number" : "0x01",
-                    "parentHash" : "77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
-                    "receiptTrie" : "adedf4b025f17a7cec34310dc98c71fc887b7f308a1172ed142cc74315c8cf6a",
-                    "stateRoot" : "ba828f05e207664016f3302c063ce4e9f79e65c8d8ce70b229b68b9ccf412f7b",
+                    "parentHash" : "0x77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
+                    "receiptTrie" : "0xadedf4b025f17a7cec34310dc98c71fc887b7f308a1172ed142cc74315c8cf6a",
+                    "stateRoot" : "0xba828f05e207664016f3302c063ce4e9f79e65c8d8ce70b229b68b9ccf412f7b",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a077c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba828f05e207664016f3302c063ce4e9f79e65c8d8ce70b229b68b9ccf412f7ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0adedf4b025f17a7cec34310dc98c71fc887b7f308a1172ed142cc74315c8cf6ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0b4fe894261cb08d697617e1c232a48034765efcd88848b4d0e433bacc610b73f8816c99412343d4972f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a077c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba828f05e207664016f3302c063ce4e9f79e65c8d8ce70b229b68b9ccf412f7ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0adedf4b025f17a7cec34310dc98c71fc887b7f308a1172ed142cc74315c8cf6ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0f3ccf0308ed5e99da4934adac6107fbbfe8ee8c71d260276849cf45a5e519ffb88840cb5c7ff267178f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "5ead39e3b1e04ef61963aa2898dc3ec73715a3ee2026b3d60721cb633174bac4",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5ead39e3b1e04ef61963aa2898dc3ec73715a3ee2026b3d60721cb633174bac4",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ead39e3b1e04ef61963aa2898dc3ec73715a3ee2026b3d60721cb633174bac4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9ad06575faad44621cb539dceb00b8eccb5f145f1435365c9b6c26ba3fb5bbe0",
+        "lastblockhash" : "0x929e663231aa855b2375253ffe27876d67016f07cc5077fa18f3754c49c44a7f",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
@@ -76,67 +81,67 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55892",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762a76e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -144,36 +149,41 @@
         }
     },
     "callcallcodecallcode_011_OOGE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "598535225f84610975a7f60127b3a03c4dd42d66af699fb448ac96f907f05eaa",
-                    "mixHash" : "2027a2bbaa2ee62173b3524d5909a9430229342f6162f470c60150f3d26d3375",
-                    "nonce" : "2a9546f084684ce6",
+                    "hash" : "0x78ef015e889bd774ba65adc5d1552a915887caeed69a6836a4558e2fb9f73b9e",
+                    "mixHash" : "0x129f928c830d948c08fafeda35cb6f055f7485ba62a0a8acda0b25782e0686cf",
+                    "nonce" : "0xc4ddd5f8c5cf67fb",
                     "number" : "0x01",
-                    "parentHash" : "77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
-                    "receiptTrie" : "adedf4b025f17a7cec34310dc98c71fc887b7f308a1172ed142cc74315c8cf6a",
-                    "stateRoot" : "ba828f05e207664016f3302c063ce4e9f79e65c8d8ce70b229b68b9ccf412f7b",
+                    "parentHash" : "0x77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
+                    "receiptTrie" : "0xadedf4b025f17a7cec34310dc98c71fc887b7f308a1172ed142cc74315c8cf6a",
+                    "stateRoot" : "0xba828f05e207664016f3302c063ce4e9f79e65c8d8ce70b229b68b9ccf412f7b",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a077c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba828f05e207664016f3302c063ce4e9f79e65c8d8ce70b229b68b9ccf412f7ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0adedf4b025f17a7cec34310dc98c71fc887b7f308a1172ed142cc74315c8cf6ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a02027a2bbaa2ee62173b3524d5909a9430229342f6162f470c60150f3d26d3375882a9546f084684ce6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a077c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba828f05e207664016f3302c063ce4e9f79e65c8d8ce70b229b68b9ccf412f7ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0adedf4b025f17a7cec34310dc98c71fc887b7f308a1172ed142cc74315c8cf6ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0129f928c830d948c08fafeda35cb6f055f7485ba62a0a8acda0b25782e0686cf88c4ddd5f8c5cf67fbf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -183,28 +193,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "5ead39e3b1e04ef61963aa2898dc3ec73715a3ee2026b3d60721cb633174bac4",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5ead39e3b1e04ef61963aa2898dc3ec73715a3ee2026b3d60721cb633174bac4",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ead39e3b1e04ef61963aa2898dc3ec73715a3ee2026b3d60721cb633174bac4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "598535225f84610975a7f60127b3a03c4dd42d66af699fb448ac96f907f05eaa",
+        "lastblockhash" : "0x78ef015e889bd774ba65adc5d1552a915887caeed69a6836a4558e2fb9f73b9e",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -212,7 +222,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
@@ -220,67 +230,67 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55892",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762a76e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -288,36 +298,41 @@
         }
     },
     "callcallcodecallcode_011_OOGE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "6b42435dc3600b74c1107532dbb4b65152ac54cf119d8dbe696ce70176fa021a",
-                    "mixHash" : "dd01d04798954cf3c188dcc13fc0d84b2a6371cab4bba2f353515a5d853b0f54",
-                    "nonce" : "c67e3b56750ffb97",
+                    "hash" : "0xd04d7a0d7084b1d6fe4efa70225ec3d64033d951de246d2e209f981c509b07cf",
+                    "mixHash" : "0xabfe085b5936eb6f8cacfdb36399e9145a6020735bafa3b982e239760ced9385",
+                    "nonce" : "0x56f6293d0136f7fd",
                     "number" : "0x01",
-                    "parentHash" : "77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
-                    "receiptTrie" : "de0abe5ddfe2a7c3654974b726b9b34cb88a6dd2c87d0a780587f42df907f382",
-                    "stateRoot" : "fb3ed53f121c2ca8e4ae2d46424167f0c3fd398542b7b0f538909e59180ec690",
+                    "parentHash" : "0x77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
+                    "receiptTrie" : "0xde0abe5ddfe2a7c3654974b726b9b34cb88a6dd2c87d0a780587f42df907f382",
+                    "stateRoot" : "0xfb3ed53f121c2ca8e4ae2d46424167f0c3fd398542b7b0f538909e59180ec690",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a077c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb3ed53f121c2ca8e4ae2d46424167f0c3fd398542b7b0f538909e59180ec690a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0de0abe5ddfe2a7c3654974b726b9b34cb88a6dd2c87d0a780587f42df907f382b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0dd01d04798954cf3c188dcc13fc0d84b2a6371cab4bba2f353515a5d853b0f5488c67e3b56750ffb97f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a077c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb3ed53f121c2ca8e4ae2d46424167f0c3fd398542b7b0f538909e59180ec690a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0de0abe5ddfe2a7c3654974b726b9b34cb88a6dd2c87d0a780587f42df907f382b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0abfe085b5936eb6f8cacfdb36399e9145a6020735bafa3b982e239760ced93858856f6293d0136f7fdf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -327,28 +342,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "5ead39e3b1e04ef61963aa2898dc3ec73715a3ee2026b3d60721cb633174bac4",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5ead39e3b1e04ef61963aa2898dc3ec73715a3ee2026b3d60721cb633174bac4",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ead39e3b1e04ef61963aa2898dc3ec73715a3ee2026b3d60721cb633174bac4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "6b42435dc3600b74c1107532dbb4b65152ac54cf119d8dbe696ce70176fa021a",
+        "lastblockhash" : "0xd04d7a0d7084b1d6fe4efa70225ec3d64033d951de246d2e209f981c509b07cf",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -356,7 +371,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
@@ -364,67 +379,67 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550d6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af2a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -432,36 +447,41 @@
         }
     },
     "callcallcodecallcode_011_OOGE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "88195c5a38d009a0db93837312cb1df04081369a454d82ac99af593dbd2c0608",
-                    "mixHash" : "f9344b6fbb222dff0cd621589ab2ecc4ba3ee01de6f6fe119107bc6850032997",
-                    "nonce" : "e63fe4f298eadbd5",
+                    "hash" : "0x155a5b9b4e283837c366b4cc5b68926c45b67abeb36889d9f6caa3354d47886e",
+                    "mixHash" : "0x25cb5b13fca2335312d882e17f1b4c5ec9a2469aab5bcd1ae5b1157ff4cdcbae",
+                    "nonce" : "0x4d1ba3e2bf82b26f",
                     "number" : "0x01",
-                    "parentHash" : "77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
-                    "receiptTrie" : "de0abe5ddfe2a7c3654974b726b9b34cb88a6dd2c87d0a780587f42df907f382",
-                    "stateRoot" : "fb3ed53f121c2ca8e4ae2d46424167f0c3fd398542b7b0f538909e59180ec690",
+                    "parentHash" : "0x77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
+                    "receiptTrie" : "0xde0abe5ddfe2a7c3654974b726b9b34cb88a6dd2c87d0a780587f42df907f382",
+                    "stateRoot" : "0xfb3ed53f121c2ca8e4ae2d46424167f0c3fd398542b7b0f538909e59180ec690",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a077c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb3ed53f121c2ca8e4ae2d46424167f0c3fd398542b7b0f538909e59180ec690a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0de0abe5ddfe2a7c3654974b726b9b34cb88a6dd2c87d0a780587f42df907f382b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0f9344b6fbb222dff0cd621589ab2ecc4ba3ee01de6f6fe119107bc685003299788e63fe4f298eadbd5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a077c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb3ed53f121c2ca8e4ae2d46424167f0c3fd398542b7b0f538909e59180ec690a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0de0abe5ddfe2a7c3654974b726b9b34cb88a6dd2c87d0a780587f42df907f382b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a025cb5b13fca2335312d882e17f1b4c5ec9a2469aab5bcd1ae5b1157ff4cdcbae884d1ba3e2bf82b26ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -471,28 +491,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "5ead39e3b1e04ef61963aa2898dc3ec73715a3ee2026b3d60721cb633174bac4",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5ead39e3b1e04ef61963aa2898dc3ec73715a3ee2026b3d60721cb633174bac4",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ead39e3b1e04ef61963aa2898dc3ec73715a3ee2026b3d60721cb633174bac4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "88195c5a38d009a0db93837312cb1df04081369a454d82ac99af593dbd2c0608",
+        "lastblockhash" : "0x155a5b9b4e283837c366b4cc5b68926c45b67abeb36889d9f6caa3354d47886e",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -500,7 +520,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
@@ -508,67 +528,223 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550d6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af2a",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x92856c27b02891d4792dc61f5f7832c40f9c780354d762dc475a29e53207712e",
+                    "mixHash" : "0x5d90c6dc42cd94b2993a466c17e706589f0e7c6f2438f96841ef2e15d8e628b2",
+                    "nonce" : "0xae3eb3b2281f8e16",
+                    "number" : "0x01",
+                    "parentHash" : "0x77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0x664cc5b08fa86417f94a8dbae65f0610c3c491a72d62eade87ce78cb8d3f539a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a077c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0664cc5b08fa86417f94a8dbae65f0610c3c491a72d62eade87ce78cb8d3f539aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a05d90c6dc42cd94b2993a466c17e706589f0e7c6f2438f96841ef2e15d8e628b288ae3eb3b2281f8e16f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0x92856c27b02891d4792dc61f5f7832c40f9c780354d762dc475a29e53207712e",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter_d0g0v0.json
index 864ba4e63..4af77be71 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcodecallcode_011_OOGMAfter_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "7b8b4c1dab72723fc1a51d02d9c9689c769fef9ae5e18e8ba249bb6e89e6354c",
-                    "mixHash" : "29bec3ef8e106b94851e66e012ceffd6124a8df17e35e16462878e268016e5cc",
-                    "nonce" : "8d00ad8bbc41845d",
+                    "hash" : "0xf8f3ad2310e79bf3f8eefb260e95d34f811ddb71db383afb37baa77b02f6315b",
+                    "mixHash" : "0xd2ef401c890e84fc8acdccdf0a61a202dbf7e6c8e17ee283727d7b11275f98a7",
+                    "nonce" : "0x0b8021d14c6f0398",
                     "number" : "0x01",
-                    "parentHash" : "56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
-                    "receiptTrie" : "782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5",
-                    "stateRoot" : "306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28",
+                    "parentHash" : "0x56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
+                    "receiptTrie" : "0x782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5",
+                    "stateRoot" : "0x306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a056aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a029bec3ef8e106b94851e66e012ceffd6124a8df17e35e16462878e268016e5cc888d00ad8bbc41845df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a056aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0d2ef401c890e84fc8acdccdf0a61a202dbf7e6c8e17ee283727d7b11275f98a7880b8021d14c6f0398f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127ac",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127ac",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7b8b4c1dab72723fc1a51d02d9c9689c769fef9ae5e18e8ba249bb6e89e6354c",
+        "lastblockhash" : "0xf8f3ad2310e79bf3f8eefb260e95d34f811ddb71db383afb37baa77b02f6315b",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcallcodecallcode_011_OOGMAfter_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "909425863c4a8f52bdf23d5bbfcd80a825d7362f9adf5473c2a8e9e31853732e",
-                    "mixHash" : "38dd5e0f9ace657ac194d5dbd605c69fbfa1f5d5b9d97aabad160b510aef952e",
-                    "nonce" : "9eb9ca9ff3291678",
+                    "hash" : "0x2c00f5d7c7c647b2b5ee8dd43d68c208ea0f8e3963a4273420a5ad795dffd224",
+                    "mixHash" : "0xcf1f8788e24245f8beccf132a04ee755f57dd8eab7ec4cb43e6aff20355fc9a6",
+                    "nonce" : "0xeb85cc16b43535e5",
                     "number" : "0x01",
-                    "parentHash" : "56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
-                    "receiptTrie" : "782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5",
-                    "stateRoot" : "306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28",
+                    "parentHash" : "0x56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
+                    "receiptTrie" : "0x782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5",
+                    "stateRoot" : "0x306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a056aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a038dd5e0f9ace657ac194d5dbd605c69fbfa1f5d5b9d97aabad160b510aef952e889eb9ca9ff3291678f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a056aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0cf1f8788e24245f8beccf132a04ee755f57dd8eab7ec4cb43e6aff20355fc9a688eb85cc16b43535e5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127ac",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127ac",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "909425863c4a8f52bdf23d5bbfcd80a825d7362f9adf5473c2a8e9e31853732e",
+        "lastblockhash" : "0x2c00f5d7c7c647b2b5ee8dd43d68c208ea0f8e3963a4273420a5ad795dffd224",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcallcodecallcode_011_OOGMAfter_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "40b5ce8e70191e4a925b58fd9a47cdbb2618c6a38fadc9a27e60ac322513b508",
-                    "mixHash" : "7cf03a6689a8f859f063c201ed4e97d027bd81a455f64833654abbfd27d4f2f4",
-                    "nonce" : "cae6ef0cf7193c57",
+                    "hash" : "0x3d52866670132d2dd55a6e029e2da82251c18d9ba080a55882e9c72a43ec889c",
+                    "mixHash" : "0xd87ce1339645f12bd416999d107f7b4c1e4d3bfede80c4c42f05052a8fa42664",
+                    "nonce" : "0x2fddc43f957904de",
                     "number" : "0x01",
-                    "parentHash" : "56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
-                    "receiptTrie" : "62c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379",
-                    "stateRoot" : "ef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967d",
+                    "parentHash" : "0x56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
+                    "receiptTrie" : "0x62c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379",
+                    "stateRoot" : "0xef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a056aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea062c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a07cf03a6689a8f859f063c201ed4e97d027bd81a455f64833654abbfd27d4f2f488cae6ef0cf7193c57f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a056aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea062c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0d87ce1339645f12bd416999d107f7b4c1e4d3bfede80c4c42f05052a8fa42664882fddc43f957904def862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127ac",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127ac",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "40b5ce8e70191e4a925b58fd9a47cdbb2618c6a38fadc9a27e60ac322513b508",
+        "lastblockhash" : "0x3d52866670132d2dd55a6e029e2da82251c18d9ba080a55882e9c72a43ec889c",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcallcodecallcode_011_OOGMAfter_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "23e246c725ea9efab5354c20bafe329eb5417d71f91b83df1e81563b6b374b6b",
-                    "mixHash" : "e6aeda7e1c93ce405ae4acb4bcbbf506ad2354772b9bdc0da1f2bc47250782a2",
-                    "nonce" : "b5ddb17db6882c4a",
+                    "hash" : "0xd4bac266a318fa620919727e1452f8efce54d918a8d062750fe20470c8a96296",
+                    "mixHash" : "0x5cd7a5d759d0ed7276de1ab490a1630f73d8a7e3b0c9715685d12ac4ffcf7e2d",
+                    "nonce" : "0x5699132286ba15d7",
                     "number" : "0x01",
-                    "parentHash" : "56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
-                    "receiptTrie" : "62c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379",
-                    "stateRoot" : "ef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967d",
+                    "parentHash" : "0x56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
+                    "receiptTrie" : "0x62c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379",
+                    "stateRoot" : "0xef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a056aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea062c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0e6aeda7e1c93ce405ae4acb4bcbbf506ad2354772b9bdc0da1f2bc47250782a288b5ddb17db6882c4af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a056aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea062c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a05cd7a5d759d0ed7276de1ab490a1630f73d8a7e3b0c9715685d12ac4ffcf7e2d885699132286ba15d7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127ac",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127ac",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "23e246c725ea9efab5354c20bafe329eb5417d71f91b83df1e81563b6b374b6b",
+        "lastblockhash" : "0xd4bac266a318fa620919727e1452f8efce54d918a8d062750fe20470c8a96296",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x714d5553dbfb49475343c0b893220a4a5fdde07da357dc386fc4d29602405a9b",
+                    "mixHash" : "0x2d23fdab5973edc7ccf4b161f0564bef59a2337c5086833101cc055899515a93",
+                    "nonce" : "0x797fc26328694dee",
+                    "number" : "0x01",
+                    "parentHash" : "0x56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0x5366edb70bb6c9935d9507479d0c547d45a4bcc6ecaa200ba16884cf3cc20f00",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a056aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05366edb70bb6c9935d9507479d0c547d45a4bcc6ecaa200ba16884cf3cc20f00a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a02d23fdab5973edc7ccf4b161f0564bef59a2337c5086833101cc055899515a9388797fc26328694deef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0x714d5553dbfb49475343c0b893220a4a5fdde07da357dc386fc4d29602405a9b",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore_d0g0v0.json
index e26df6509..dfad28fe4 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcodecallcode_011_OOGMBefore_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "86d0d4ac37ddf22e514e68a5048acde99861214e6a7f3fe57efd09a18f122240",
-                    "mixHash" : "ed5ceb9ecd2475b1e5b7378721c7dcc50e7b9e547feafdade448cd08db125ab6",
-                    "nonce" : "52d1617523780c4f",
+                    "hash" : "0x69b36a9e30d8e33d745e264d62a43e50af70f1984365de3b80eae8811e388c1f",
+                    "mixHash" : "0x3949c54138cb2f6efb7771bb0a89aa50c471ccd8819fd5f4669a8f42a648ac08",
+                    "nonce" : "0x77ec76bf02ad57cc",
                     "number" : "0x01",
-                    "parentHash" : "2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
-                    "receiptTrie" : "2da22ab4992ff29871438eb68f0d6fb255eea7fbdd68252ecd58d3c6e0f761af",
-                    "stateRoot" : "04be47b93cbbc9621e706c5ace7711a06043764e5f3596e379799d35e0bb63b5",
+                    "parentHash" : "0x2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
+                    "receiptTrie" : "0x2da22ab4992ff29871438eb68f0d6fb255eea7fbdd68252ecd58d3c6e0f761af",
+                    "stateRoot" : "0x04be47b93cbbc9621e706c5ace7711a06043764e5f3596e379799d35e0bb63b5",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004be47b93cbbc9621e706c5ace7711a06043764e5f3596e379799d35e0bb63b5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02da22ab4992ff29871438eb68f0d6fb255eea7fbdd68252ecd58d3c6e0f761afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0ed5ceb9ecd2475b1e5b7378721c7dcc50e7b9e547feafdade448cd08db125ab68852d1617523780c4ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a02fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004be47b93cbbc9621e706c5ace7711a06043764e5f3596e379799d35e0bb63b5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02da22ab4992ff29871438eb68f0d6fb255eea7fbdd68252ecd58d3c6e0f761afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a03949c54138cb2f6efb7771bb0a89aa50c471ccd8819fd5f4669a8f42a648ac088877ec76bf02ad57ccf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "84e448b11e840d6d7e246998bb137c000c77041622de1b16ccdc2afa4fefb5fb",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x84e448b11e840d6d7e246998bb137c000c77041622de1b16ccdc2afa4fefb5fb",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084e448b11e840d6d7e246998bb137c000c77041622de1b16ccdc2afa4fefb5fba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "86d0d4ac37ddf22e514e68a5048acde99861214e6a7f3fe57efd09a18f122240",
+        "lastblockhash" : "0x69b36a9e30d8e33d745e264d62a43e50af70f1984365de3b80eae8811e388c1f",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa0c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcallcodecallcode_011_OOGMBefore_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "0b8abb44b007fedaa53b29ccb4a5df13966ff16b8f980e81b6df6713dd29a8a2",
-                    "mixHash" : "bf65323960ab447d6c6b744712ef577c736bd7eb53a549e49287ea1b7dc81b89",
-                    "nonce" : "f52d3aef3bc96c4a",
+                    "hash" : "0x5514c47c0f01102dce406b57ffcf1945e66dc8a141babb069ed3003743ffdeab",
+                    "mixHash" : "0x402d7c0d1b001ba7f8ed084ad2b74f37ed32e270c1712b2e517d5b9c3e88ff53",
+                    "nonce" : "0x6cfa3e5f4bb5d336",
                     "number" : "0x01",
-                    "parentHash" : "2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
-                    "receiptTrie" : "2da22ab4992ff29871438eb68f0d6fb255eea7fbdd68252ecd58d3c6e0f761af",
-                    "stateRoot" : "04be47b93cbbc9621e706c5ace7711a06043764e5f3596e379799d35e0bb63b5",
+                    "parentHash" : "0x2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
+                    "receiptTrie" : "0x2da22ab4992ff29871438eb68f0d6fb255eea7fbdd68252ecd58d3c6e0f761af",
+                    "stateRoot" : "0x04be47b93cbbc9621e706c5ace7711a06043764e5f3596e379799d35e0bb63b5",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004be47b93cbbc9621e706c5ace7711a06043764e5f3596e379799d35e0bb63b5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02da22ab4992ff29871438eb68f0d6fb255eea7fbdd68252ecd58d3c6e0f761afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0bf65323960ab447d6c6b744712ef577c736bd7eb53a549e49287ea1b7dc81b8988f52d3aef3bc96c4af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a02fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004be47b93cbbc9621e706c5ace7711a06043764e5f3596e379799d35e0bb63b5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02da22ab4992ff29871438eb68f0d6fb255eea7fbdd68252ecd58d3c6e0f761afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0402d7c0d1b001ba7f8ed084ad2b74f37ed32e270c1712b2e517d5b9c3e88ff53886cfa3e5f4bb5d336f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "84e448b11e840d6d7e246998bb137c000c77041622de1b16ccdc2afa4fefb5fb",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x84e448b11e840d6d7e246998bb137c000c77041622de1b16ccdc2afa4fefb5fb",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084e448b11e840d6d7e246998bb137c000c77041622de1b16ccdc2afa4fefb5fba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0b8abb44b007fedaa53b29ccb4a5df13966ff16b8f980e81b6df6713dd29a8a2",
+        "lastblockhash" : "0x5514c47c0f01102dce406b57ffcf1945e66dc8a141babb069ed3003743ffdeab",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa0c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcallcodecallcode_011_OOGMBefore_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "da66aaef7239e0afd0c78fd6ca756d37d5be85481fdcb55ad9068d89250cbc7c",
-                    "mixHash" : "04040ef03e6f3653d395c3b2759cc5be064623ba45fe8093d4a90e17de3d50d6",
-                    "nonce" : "2102bd470cea64a2",
+                    "hash" : "0x339bb2d960d1ff555adb93b2d813a598335fc80811d7a1cd6ebbfe7494291033",
+                    "mixHash" : "0x6d6c8bbbd1a01da907cca085cf2606c97e9a65e1ffefb92c68fb10d4f3d81139",
+                    "nonce" : "0xb8632e2c35e529d9",
                     "number" : "0x01",
-                    "parentHash" : "2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
-                    "receiptTrie" : "880b026572d5166b95e88baf6bef126fe6e04b298c64ac64df694e2e29a40f06",
-                    "stateRoot" : "5773dc8c57c4ed7eeba0faa6a10d7b53042ff0649928867caf08ca2e9eb12d44",
+                    "parentHash" : "0x2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
+                    "receiptTrie" : "0x880b026572d5166b95e88baf6bef126fe6e04b298c64ac64df694e2e29a40f06",
+                    "stateRoot" : "0x5773dc8c57c4ed7eeba0faa6a10d7b53042ff0649928867caf08ca2e9eb12d44",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05773dc8c57c4ed7eeba0faa6a10d7b53042ff0649928867caf08ca2e9eb12d44a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0880b026572d5166b95e88baf6bef126fe6e04b298c64ac64df694e2e29a40f06b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a004040ef03e6f3653d395c3b2759cc5be064623ba45fe8093d4a90e17de3d50d6882102bd470cea64a2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a02fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05773dc8c57c4ed7eeba0faa6a10d7b53042ff0649928867caf08ca2e9eb12d44a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0880b026572d5166b95e88baf6bef126fe6e04b298c64ac64df694e2e29a40f06b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a06d6c8bbbd1a01da907cca085cf2606c97e9a65e1ffefb92c68fb10d4f3d8113988b8632e2c35e529d9f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,28 +340,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "84e448b11e840d6d7e246998bb137c000c77041622de1b16ccdc2afa4fefb5fb",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x84e448b11e840d6d7e246998bb137c000c77041622de1b16ccdc2afa4fefb5fb",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084e448b11e840d6d7e246998bb137c000c77041622de1b16ccdc2afa4fefb5fba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "da66aaef7239e0afd0c78fd6ca756d37d5be85481fdcb55ad9068d89250cbc7c",
+        "lastblockhash" : "0x339bb2d960d1ff555adb93b2d813a598335fc80811d7a1cd6ebbfe7494291033",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -354,74 +369,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -429,36 +444,41 @@
         }
     },
     "callcallcodecallcode_011_OOGMBefore_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "06f8ed186d562be5d30655ff72378d8144f2724f5e848574e04ffa5bd67dd5ca",
-                    "mixHash" : "f19871c8e7dc828396064f1d05a07f9b326634f319bdef9c4edd61e0c27ff69d",
-                    "nonce" : "31630864e5ae57c1",
+                    "hash" : "0xaf9645d8743ee6ced8a1c8d7e1d2c1c7abb48010c75d114f06a01ce62257f3e9",
+                    "mixHash" : "0xd3dac25d1a04ef0b70cdb2fad85f5df5e448f5a873e3d8f19863a2a13a906218",
+                    "nonce" : "0x8937417edc9e6b48",
                     "number" : "0x01",
-                    "parentHash" : "2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
-                    "receiptTrie" : "880b026572d5166b95e88baf6bef126fe6e04b298c64ac64df694e2e29a40f06",
-                    "stateRoot" : "5773dc8c57c4ed7eeba0faa6a10d7b53042ff0649928867caf08ca2e9eb12d44",
+                    "parentHash" : "0x2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
+                    "receiptTrie" : "0x880b026572d5166b95e88baf6bef126fe6e04b298c64ac64df694e2e29a40f06",
+                    "stateRoot" : "0x5773dc8c57c4ed7eeba0faa6a10d7b53042ff0649928867caf08ca2e9eb12d44",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05773dc8c57c4ed7eeba0faa6a10d7b53042ff0649928867caf08ca2e9eb12d44a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0880b026572d5166b95e88baf6bef126fe6e04b298c64ac64df694e2e29a40f06b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0f19871c8e7dc828396064f1d05a07f9b326634f319bdef9c4edd61e0c27ff69d8831630864e5ae57c1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a02fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05773dc8c57c4ed7eeba0faa6a10d7b53042ff0649928867caf08ca2e9eb12d44a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0880b026572d5166b95e88baf6bef126fe6e04b298c64ac64df694e2e29a40f06b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0d3dac25d1a04ef0b70cdb2fad85f5df5e448f5a873e3d8f19863a2a13a906218888937417edc9e6b48f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -468,28 +488,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "84e448b11e840d6d7e246998bb137c000c77041622de1b16ccdc2afa4fefb5fb",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x84e448b11e840d6d7e246998bb137c000c77041622de1b16ccdc2afa4fefb5fb",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084e448b11e840d6d7e246998bb137c000c77041622de1b16ccdc2afa4fefb5fba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "06f8ed186d562be5d30655ff72378d8144f2724f5e848574e04ffa5bd67dd5ca",
+        "lastblockhash" : "0xaf9645d8743ee6ced8a1c8d7e1d2c1c7abb48010c75d114f06a01ce62257f3e9",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -497,74 +517,229 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xfe87379021a10523399f17004e0ec58755a55377010c91ab0f2a67efd95d893f",
+                    "mixHash" : "0x5f493b8fcec6ab006c7575c29d460ee871d5caff5090ca1361388c649d890fb9",
+                    "nonce" : "0x256447414c5b959e",
+                    "number" : "0x01",
+                    "parentHash" : "0x2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0xae0c878e566a25c03ba91f8b7a4e02bea741d9f8f438b3a5b52e1c338aa276d2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a02fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae0c878e566a25c03ba91f8b7a4e02bea741d9f8f438b3a5b52e1c338aa276d2a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a05f493b8fcec6ab006c7575c29d460ee871d5caff5090ca1361388c649d890fb988256447414c5b959ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0xfe87379021a10523399f17004e0ec58755a55377010c91ab0f2a67efd95d893f",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd_d0g0v0.json
index 6128ada66..156ea8016 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcodecallcode_011_SuicideEnd_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "ee2decb330f2060f10d5d4d10d4fa6cdfa7325df9f93e7458935769f3c60b075",
-                    "mixHash" : "9b91ec0f0f64e8922c88fab1bc02f6f442c096ca99d110b4211907d9f17831bb",
-                    "nonce" : "36349e8c4a5f635f",
+                    "hash" : "0xaf42f35960dbc5659648807715ca5a3200abd2c2bcdd0e28682a1c9a39f57af1",
+                    "mixHash" : "0x9f7385618197d3bac18197369c9e71e30031db80a9735634cc902cba03e00328",
+                    "nonce" : "0x112ca0b2fce141d2",
                     "number" : "0x01",
-                    "parentHash" : "6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
-                    "receiptTrie" : "295cb3a6fa3988ff1955a82ebe708c62f32c8ff55a8e632e0455be053f75b6d6",
-                    "stateRoot" : "1c5f3e66713696c86e3f2541218ff3c65dc0880e635b4fe4cc6657e347a97ac2",
+                    "parentHash" : "0x6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
+                    "receiptTrie" : "0x295cb3a6fa3988ff1955a82ebe708c62f32c8ff55a8e632e0455be053f75b6d6",
+                    "stateRoot" : "0x1c5f3e66713696c86e3f2541218ff3c65dc0880e635b4fe4cc6657e347a97ac2",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c5f3e66713696c86e3f2541218ff3c65dc0880e635b4fe4cc6657e347a97ac2a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0295cb3a6fa3988ff1955a82ebe708c62f32c8ff55a8e632e0455be053f75b6d6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a09b91ec0f0f64e8922c88fab1bc02f6f442c096ca99d110b4211907d9f17831bb8836349e8c4a5f635ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c5f3e66713696c86e3f2541218ff3c65dc0880e635b4fe4cc6657e347a97ac2a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0295cb3a6fa3988ff1955a82ebe708c62f32c8ff55a8e632e0455be053f75b6d6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a09f7385618197d3bac18197369c9e71e30031db80a9735634cc902cba03e0032888112ca0b2fce141d2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b87db5a520d36dbf8626014dfff5a58abf38f042e6ebcfe555a7490072c7e23b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb87db5a520d36dbf8626014dfff5a58abf38f042e6ebcfe555a7490072c7e23b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b87db5a520d36dbf8626014dfff5a58abf38f042e6ebcfe555a7490072c7e23ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ee2decb330f2060f10d5d4d10d4fa6cdfa7325df9f93e7458935769f3c60b075",
+        "lastblockhash" : "0xaf42f35960dbc5659648807715ca5a3200abd2c2bcdd0e28682a1c9a39f57af1",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -68,67 +73,67 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f548e7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762b719",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -136,36 +141,41 @@
         }
     },
     "callcallcodecallcode_011_SuicideEnd_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "b9f3987ccc81c60e0eecb6dcfd29f18e0ab87439570da59e98936e7abdefeded",
-                    "mixHash" : "7ce13eac6933c5c45c6e278826cf2fc9dda787a250344ba05bc2e4d228e7ccdd",
-                    "nonce" : "0cfb13a42936507a",
+                    "hash" : "0x11402f06ab2ad5273b84347a423879eb4cb4b0c47b54e4726bff039574419df6",
+                    "mixHash" : "0x81ad3270a611c60d279ad3cb1697f73e4e61d652678551755d02d1704a4ffbd7",
+                    "nonce" : "0x5ed0d47e55512ff8",
                     "number" : "0x01",
-                    "parentHash" : "6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
-                    "receiptTrie" : "295cb3a6fa3988ff1955a82ebe708c62f32c8ff55a8e632e0455be053f75b6d6",
-                    "stateRoot" : "1c5f3e66713696c86e3f2541218ff3c65dc0880e635b4fe4cc6657e347a97ac2",
+                    "parentHash" : "0x6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
+                    "receiptTrie" : "0x295cb3a6fa3988ff1955a82ebe708c62f32c8ff55a8e632e0455be053f75b6d6",
+                    "stateRoot" : "0x1c5f3e66713696c86e3f2541218ff3c65dc0880e635b4fe4cc6657e347a97ac2",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c5f3e66713696c86e3f2541218ff3c65dc0880e635b4fe4cc6657e347a97ac2a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0295cb3a6fa3988ff1955a82ebe708c62f32c8ff55a8e632e0455be053f75b6d6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a07ce13eac6933c5c45c6e278826cf2fc9dda787a250344ba05bc2e4d228e7ccdd880cfb13a42936507af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c5f3e66713696c86e3f2541218ff3c65dc0880e635b4fe4cc6657e347a97ac2a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0295cb3a6fa3988ff1955a82ebe708c62f32c8ff55a8e632e0455be053f75b6d6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a081ad3270a611c60d279ad3cb1697f73e4e61d652678551755d02d1704a4ffbd7885ed0d47e55512ff8f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -175,28 +185,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b87db5a520d36dbf8626014dfff5a58abf38f042e6ebcfe555a7490072c7e23b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb87db5a520d36dbf8626014dfff5a58abf38f042e6ebcfe555a7490072c7e23b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b87db5a520d36dbf8626014dfff5a58abf38f042e6ebcfe555a7490072c7e23ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b9f3987ccc81c60e0eecb6dcfd29f18e0ab87439570da59e98936e7abdefeded",
+        "lastblockhash" : "0x11402f06ab2ad5273b84347a423879eb4cb4b0c47b54e4726bff039574419df6",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -204,67 +214,67 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f548e7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762b719",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -272,36 +282,41 @@
         }
     },
     "callcallcodecallcode_011_SuicideEnd_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "2414b26f09616612df798498c26e2bd6b1399bfaec734fe97cb6ff9d86239345",
-                    "mixHash" : "d24fabed9ecd1c77d34f219aa53cebe34e5e68ae2c9aae243e9343c1ae92691d",
-                    "nonce" : "93d191a0d898d2de",
+                    "hash" : "0x81a9077b89901fc7f8d55c21d035980bb3b860ff027e8557a60c538b7d0e3bc6",
+                    "mixHash" : "0xa667e00ce7d92e4fb1172795767167c8dd274513a4db04f2b0f722655c14e160",
+                    "nonce" : "0x3cf38465e198d951",
                     "number" : "0x01",
-                    "parentHash" : "6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
-                    "receiptTrie" : "8ac8f80f05fe0e5eb93c97d2337fc336282c2a255c6181136939803821c2344c",
-                    "stateRoot" : "712ffd5cddbdb3cb44d8a8540433a7c94896ad85b7aab2b026e7329262d96d6d",
+                    "parentHash" : "0x6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
+                    "receiptTrie" : "0x8ac8f80f05fe0e5eb93c97d2337fc336282c2a255c6181136939803821c2344c",
+                    "stateRoot" : "0x712ffd5cddbdb3cb44d8a8540433a7c94896ad85b7aab2b026e7329262d96d6d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0712ffd5cddbdb3cb44d8a8540433a7c94896ad85b7aab2b026e7329262d96d6da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a08ac8f80f05fe0e5eb93c97d2337fc336282c2a255c6181136939803821c2344cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0d24fabed9ecd1c77d34f219aa53cebe34e5e68ae2c9aae243e9343c1ae92691d8893d191a0d898d2def862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0712ffd5cddbdb3cb44d8a8540433a7c94896ad85b7aab2b026e7329262d96d6da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a08ac8f80f05fe0e5eb93c97d2337fc336282c2a255c6181136939803821c2344cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0a667e00ce7d92e4fb1172795767167c8dd274513a4db04f2b0f722655c14e160883cf38465e198d951f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -311,28 +326,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b87db5a520d36dbf8626014dfff5a58abf38f042e6ebcfe555a7490072c7e23b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb87db5a520d36dbf8626014dfff5a58abf38f042e6ebcfe555a7490072c7e23b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b87db5a520d36dbf8626014dfff5a58abf38f042e6ebcfe555a7490072c7e23ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2414b26f09616612df798498c26e2bd6b1399bfaec734fe97cb6ff9d86239345",
+        "lastblockhash" : "0x81a9077b89901fc7f8d55c21d035980bb3b860ff027e8557a60c538b7d0e3bc6",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -340,67 +355,67 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52da3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762d25d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -408,36 +423,41 @@
         }
     },
     "callcallcodecallcode_011_SuicideEnd_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "220f59043d2cd10b76866f7dd53f953a89763652af0e702b705648b9d2d3fbe2",
-                    "mixHash" : "9e60dbb38bf5fd67b930a3d7d41c1e5b717c7927656419023854ebe089aae388",
-                    "nonce" : "bd4669c7a1cd8c4b",
+                    "hash" : "0x43e594b46a7b5aa61f512868a58a8c7abcb17602c503e5ff1fc958f9a8c19549",
+                    "mixHash" : "0x444aed557393497ade196cf5e100ef0468455f77ce915354ee1d9173803168c9",
+                    "nonce" : "0x7ca2b0f0eb6a7cbb",
                     "number" : "0x01",
-                    "parentHash" : "6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
-                    "receiptTrie" : "8ac8f80f05fe0e5eb93c97d2337fc336282c2a255c6181136939803821c2344c",
-                    "stateRoot" : "712ffd5cddbdb3cb44d8a8540433a7c94896ad85b7aab2b026e7329262d96d6d",
+                    "parentHash" : "0x6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
+                    "receiptTrie" : "0x8ac8f80f05fe0e5eb93c97d2337fc336282c2a255c6181136939803821c2344c",
+                    "stateRoot" : "0x712ffd5cddbdb3cb44d8a8540433a7c94896ad85b7aab2b026e7329262d96d6d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0712ffd5cddbdb3cb44d8a8540433a7c94896ad85b7aab2b026e7329262d96d6da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a08ac8f80f05fe0e5eb93c97d2337fc336282c2a255c6181136939803821c2344cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a09e60dbb38bf5fd67b930a3d7d41c1e5b717c7927656419023854ebe089aae38888bd4669c7a1cd8c4bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0712ffd5cddbdb3cb44d8a8540433a7c94896ad85b7aab2b026e7329262d96d6da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a08ac8f80f05fe0e5eb93c97d2337fc336282c2a255c6181136939803821c2344cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0444aed557393497ade196cf5e100ef0468455f77ce915354ee1d9173803168c9887ca2b0f0eb6a7cbbf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -447,28 +467,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b87db5a520d36dbf8626014dfff5a58abf38f042e6ebcfe555a7490072c7e23b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb87db5a520d36dbf8626014dfff5a58abf38f042e6ebcfe555a7490072c7e23b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b87db5a520d36dbf8626014dfff5a58abf38f042e6ebcfe555a7490072c7e23ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "220f59043d2cd10b76866f7dd53f953a89763652af0e702b705648b9d2d3fbe2",
+        "lastblockhash" : "0x43e594b46a7b5aa61f512868a58a8c7abcb17602c503e5ff1fc958f9a8c19549",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -476,67 +496,215 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52da3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762d25d",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xc75ac2210417e289c5cbafb1ebd0ba94d2a62e7776bb072dc2d30be2f8fa6f0c",
+                    "mixHash" : "0x788554fdcc4692858a0895da1db00bef95ce1a966648a1dc9aea012baf4f5c40",
+                    "nonce" : "0x245c24eb213bd85b",
+                    "number" : "0x01",
+                    "parentHash" : "0x6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0x803717ecac3d8a23c925e4efbd12f420561be6cf493b4b1e3d984dd1c5e1f18c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a06fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0803717ecac3d8a23c925e4efbd12f420561be6cf493b4b1e3d984dd1c5e1f18ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0788554fdcc4692858a0895da1db00bef95ce1a966648a1dc9aea012baf4f5c4088245c24eb213bd85bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xc75ac2210417e289c5cbafb1ebd0ba94d2a62e7776bb072dc2d30be2f8fa6f0c",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle.json
deleted file mode 100644
index 692f535dc..000000000
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle.json
+++ /dev/null
@@ -1,546 +0,0 @@
-{
-    "callcallcodecallcode_011_SuicideMiddle_d0g0v0_EIP150" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c7",
-                    "hash" : "3668574a446669f92b4cd7db654590fb98ee096bd7191dcfe75193151d96d728",
-                    "mixHash" : "492fddc9484fdcc2fe41306a2426c7b86a593d8acb8799434964fabf3a20f112",
-                    "nonce" : "ccab21c3d7f646f9",
-                    "number" : "0x01",
-                    "parentHash" : "504dc889d8e9cc9eefc795245a694ce61ef66e68b634c216f1e96c1aef87a550",
-                    "receiptTrie" : "307817e31b9bc351ba21df96ab9c29e72f8b2b9a082233de57277ef5a6e0cdba",
-                    "stateRoot" : "bea9c07701e8dace2c93e2e9509fd35ecbc051db5678cc58846a89b625853bd8",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0504dc889d8e9cc9eefc795245a694ce61ef66e68b634c216f1e96c1aef87a550a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bea9c07701e8dace2c93e2e9509fd35ecbc051db5678cc58846a89b625853bd8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0307817e31b9bc351ba21df96ab9c29e72f8b2b9a082233de57277ef5a6e0cdbab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0492fddc9484fdcc2fe41306a2426c7b86a593d8acb8799434964fabf3a20f11288ccab21c3d7f646f9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "504dc889d8e9cc9eefc795245a694ce61ef66e68b634c216f1e96c1aef87a550",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1f223118ae190fbc8a59dfe369b45da9fb67c8806a09f99394e00202b4ded691",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f223118ae190fbc8a59dfe369b45da9fb67c8806a09f99394e00202b4ded691a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3668574a446669f92b4cd7db654590fb98ee096bd7191dcfe75193151d96d728",
-        "network" : "EIP150",
-        "postState" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635639",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcodecallcode_011_SuicideMiddle_d0g0v0_EIP158" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c7",
-                    "hash" : "deaa5c4874c13ac13a16c0b9b72c7eca1078ce96db6aad258e2adbea836df251",
-                    "mixHash" : "8ca93db5cd9a569473ce321b14a6d278743902c4e12c24456b47e0102eb93063",
-                    "nonce" : "62ee96a9ca5dd3c0",
-                    "number" : "0x01",
-                    "parentHash" : "504dc889d8e9cc9eefc795245a694ce61ef66e68b634c216f1e96c1aef87a550",
-                    "receiptTrie" : "307817e31b9bc351ba21df96ab9c29e72f8b2b9a082233de57277ef5a6e0cdba",
-                    "stateRoot" : "bea9c07701e8dace2c93e2e9509fd35ecbc051db5678cc58846a89b625853bd8",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0504dc889d8e9cc9eefc795245a694ce61ef66e68b634c216f1e96c1aef87a550a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bea9c07701e8dace2c93e2e9509fd35ecbc051db5678cc58846a89b625853bd8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0307817e31b9bc351ba21df96ab9c29e72f8b2b9a082233de57277ef5a6e0cdbab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a08ca93db5cd9a569473ce321b14a6d278743902c4e12c24456b47e0102eb930638862ee96a9ca5dd3c0f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "504dc889d8e9cc9eefc795245a694ce61ef66e68b634c216f1e96c1aef87a550",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1f223118ae190fbc8a59dfe369b45da9fb67c8806a09f99394e00202b4ded691",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f223118ae190fbc8a59dfe369b45da9fb67c8806a09f99394e00202b4ded691a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "deaa5c4874c13ac13a16c0b9b72c7eca1078ce96db6aad258e2adbea836df251",
-        "network" : "EIP158",
-        "postState" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635639",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcodecallcode_011_SuicideMiddle_d0g0v0_Frontier" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9117",
-                    "hash" : "8fbb6f320cb46f2d838633dae719797da713d8ce3407b412bd9c9f201f5d45ac",
-                    "mixHash" : "04a2e6c75e4ed06d9fb1c52f003c4e2ea6079ba05ce35f8c26c60a1038cc8c75",
-                    "nonce" : "98452420705b8c67",
-                    "number" : "0x01",
-                    "parentHash" : "504dc889d8e9cc9eefc795245a694ce61ef66e68b634c216f1e96c1aef87a550",
-                    "receiptTrie" : "c2d8afe679f3f6330a622fe0e9c055d108df2209601bd151baa0452c85af0874",
-                    "stateRoot" : "2710460700dcd55bf087efead17a5a30f6a51651a24e9c76628df981d177aa54",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0504dc889d8e9cc9eefc795245a694ce61ef66e68b634c216f1e96c1aef87a550a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02710460700dcd55bf087efead17a5a30f6a51651a24e9c76628df981d177aa54a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c2d8afe679f3f6330a622fe0e9c055d108df2209601bd151baa0452c85af0874b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a004a2e6c75e4ed06d9fb1c52f003c4e2ea6079ba05ce35f8c26c60a1038cc8c758898452420705b8c67f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "504dc889d8e9cc9eefc795245a694ce61ef66e68b634c216f1e96c1aef87a550",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1f223118ae190fbc8a59dfe369b45da9fb67c8806a09f99394e00202b4ded691",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f223118ae190fbc8a59dfe369b45da9fb67c8806a09f99394e00202b4ded691a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8fbb6f320cb46f2d838633dae719797da713d8ce3407b412bd9c9f201f5d45ac",
-        "network" : "Frontier",
-        "postState" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49117",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636ee9",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcodecallcode_011_SuicideMiddle_d0g0v0_Homestead" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9117",
-                    "hash" : "414312f21ec87e272b8b54e596e58a1627bbfbf2554b42898c34fe4f8977199a",
-                    "mixHash" : "a19afe588f566e26e15951b34b58f5f0934b8d0c84f396c803873e0d533a208e",
-                    "nonce" : "8726f0159518c65d",
-                    "number" : "0x01",
-                    "parentHash" : "504dc889d8e9cc9eefc795245a694ce61ef66e68b634c216f1e96c1aef87a550",
-                    "receiptTrie" : "c2d8afe679f3f6330a622fe0e9c055d108df2209601bd151baa0452c85af0874",
-                    "stateRoot" : "2710460700dcd55bf087efead17a5a30f6a51651a24e9c76628df981d177aa54",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0504dc889d8e9cc9eefc795245a694ce61ef66e68b634c216f1e96c1aef87a550a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02710460700dcd55bf087efead17a5a30f6a51651a24e9c76628df981d177aa54a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c2d8afe679f3f6330a622fe0e9c055d108df2209601bd151baa0452c85af0874b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0a19afe588f566e26e15951b34b58f5f0934b8d0c84f396c803873e0d533a208e888726f0159518c65df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "504dc889d8e9cc9eefc795245a694ce61ef66e68b634c216f1e96c1aef87a550",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1f223118ae190fbc8a59dfe369b45da9fb67c8806a09f99394e00202b4ded691",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f223118ae190fbc8a59dfe369b45da9fb67c8806a09f99394e00202b4ded691a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "414312f21ec87e272b8b54e596e58a1627bbfbf2554b42898c34fe4f8977199a",
-        "network" : "Homestead",
-        "postState" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49117",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636ee9",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle_d0g0v0.json
new file mode 100644
index 000000000..64a93c010
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle_d0g0v0.json
@@ -0,0 +1,714 @@
+{
+    "callcallcodecallcode_011_SuicideMiddle_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x265af138fec75862d070af6185ebd8d44f2a1f54c7ed6d039be46665b936b3d7",
+                    "mixHash" : "0xd97fe8f7aadf197512e17bbad1704a7f0973b98e2fb716ac2a85dc168a9e213c",
+                    "nonce" : "0x833b8f04804ec457",
+                    "number" : "0x01",
+                    "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
+                    "receiptTrie" : "0x40d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51",
+                    "stateRoot" : "0x76de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0d97fe8f7aadf197512e17bbad1704a7f0973b98e2fb716ac2a85dc168a9e213c88833b8f04804ec457f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x265af138fec75862d070af6185ebd8d44f2a1f54c7ed6d039be46665b936b3d7",
+        "network" : "EIP150",
+        "postState" : {
+            "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_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xc4226c2a17df852f81e96df8cd74b87f91b3fde3f4dd72b11251a6d3b51b33a0",
+                    "mixHash" : "0x95f606d550c228f4b6b086cbd8e3d37bf7030542cc3dd7c25e85aeb114829ed6",
+                    "nonce" : "0x5a69d368bbaafda4",
+                    "number" : "0x01",
+                    "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
+                    "receiptTrie" : "0x40d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51",
+                    "stateRoot" : "0x76de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a095f606d550c228f4b6b086cbd8e3d37bf7030542cc3dd7c25e85aeb114829ed6885a69d368bbaafda4f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xc4226c2a17df852f81e96df8cd74b87f91b3fde3f4dd72b11251a6d3b51b33a0",
+        "network" : "EIP158",
+        "postState" : {
+            "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_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_SuicideMiddle_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x9117",
+                    "hash" : "0xf10fe20cdc6cc4a3333ea3b955a012fd091f68033464ddb2a535d603600a381d",
+                    "mixHash" : "0x15265ad22e293190b85231d206404855449b30727e2dfd0e71c12d27f9dea08d",
+                    "nonce" : "0x97d076e97bd4f224",
+                    "number" : "0x01",
+                    "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
+                    "receiptTrie" : "0xc8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06b",
+                    "stateRoot" : "0xb31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a015265ad22e293190b85231d206404855449b30727e2dfd0e71c12d27f9dea08d8897d076e97bd4f224f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xf10fe20cdc6cc4a3333ea3b955a012fd091f68033464ddb2a535d603600a381d",
+        "network" : "Frontier",
+        "postState" : {
+            "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" : "0x4563918244f49117",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7636ee9",
+                "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_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_SuicideMiddle_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x9117",
+                    "hash" : "0x8cb73591123e8393c10199e0207bf465d0137ecbf4acd49b156c3835915df8fa",
+                    "mixHash" : "0xb57f7a47a0c239e62c17955b8971065d32186f955915e989ae1402ced10a8bb9",
+                    "nonce" : "0x6fb90abc44769566",
+                    "number" : "0x01",
+                    "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
+                    "receiptTrie" : "0xc8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06b",
+                    "stateRoot" : "0xb31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0b57f7a47a0c239e62c17955b8971065d32186f955915e989ae1402ced10a8bb9886fb90abc44769566f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x8cb73591123e8393c10199e0207bf465d0137ecbf4acd49b156c3835915df8fa",
+        "network" : "Homestead",
+        "postState" : {
+            "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" : "0x4563918244f49117",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7636ee9",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x444ca0e9cc5317dcbad3d098611db75ae3bd05674076e2d162ba120a822392b9",
+                    "mixHash" : "0x79ff578eff50c29324433eb20b8416032e0885a77e27926f6f9e0c637bedefaf",
+                    "nonce" : "0x8bf3875ea4fb6e36",
+                    "number" : "0x01",
+                    "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x39f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a079ff578eff50c29324433eb20b8416032e0885a77e27926f6f9e0c637bedefaf888bf3875ea4fb6e36f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x444ca0e9cc5317dcbad3d098611db75ae3bd05674076e2d162ba120a822392b9",
+        "network" : "Metropolis",
+        "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" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_d0g0v0.json
index 1ec16d78c..6abe339c9 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcodecallcode_011_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "337783ca6fce9835a5834de9348258bfa9c0e0418bd1813a34ca76fbe1675bff",
-                    "mixHash" : "4ef89813ffdbfca928c01dfbd5f8495444fe09d9bb61abde62ce63f62ebaaced",
-                    "nonce" : "93332c4a4871e134",
+                    "hash" : "0x83952b0d00bf32af8a6ca56af53e7f996d9552651f18f6cb19d04d856433fdb3",
+                    "mixHash" : "0xf995d4526143463cb8d1536785704bd714a09b341aad0837fe43823b8aac6cc2",
+                    "nonce" : "0x2f7a9c30ae7099cd",
                     "number" : "0x01",
-                    "parentHash" : "6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
-                    "receiptTrie" : "f30a45b5d1dbd855ea3959fea5b45818688b0dca4f44e22344b7c70c3c7a2cfb",
-                    "stateRoot" : "5239a49d0739ca7f66a76ed1821c5d321800606aa139787ee25ec521a4a81c8d",
+                    "parentHash" : "0x6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
+                    "receiptTrie" : "0xf30a45b5d1dbd855ea3959fea5b45818688b0dca4f44e22344b7c70c3c7a2cfb",
+                    "stateRoot" : "0x5239a49d0739ca7f66a76ed1821c5d321800606aa139787ee25ec521a4a81c8d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05239a49d0739ca7f66a76ed1821c5d321800606aa139787ee25ec521a4a81c8da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f30a45b5d1dbd855ea3959fea5b45818688b0dca4f44e22344b7c70c3c7a2cfbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a04ef89813ffdbfca928c01dfbd5f8495444fe09d9bb61abde62ce63f62ebaaced8893332c4a4871e134f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05239a49d0739ca7f66a76ed1821c5d321800606aa139787ee25ec521a4a81c8da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f30a45b5d1dbd855ea3959fea5b45818688b0dca4f44e22344b7c70c3c7a2cfbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0f995d4526143463cb8d1536785704bd714a09b341aad0837fe43823b8aac6cc2882f7a9c30ae7099cdf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "d68672c2a76837125043a3efcc70dd7d51135b01d601a604dc02a2de78faa9fb",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd68672c2a76837125043a3efcc70dd7d51135b01d601a604dc02a2de78faa9fb",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d68672c2a76837125043a3efcc70dd7d51135b01d601a604dc02a2de78faa9fba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "337783ca6fce9835a5834de9348258bfa9c0e0418bd1813a34ca76fbe1675bff",
+        "lastblockhash" : "0x83952b0d00bf32af8a6ca56af53e7f996d9552651f18f6cb19d04d856433fdb3",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640001",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
@@ -85,67 +90,67 @@
                     "0x07" : "0x03"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f804a3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ffb5d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -153,36 +158,41 @@
         }
     },
     "callcallcodecallcode_011_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "8c9560e2a3cc2c0a68117257841c7eaaf9edb95f8cf875de50e8526eed74c6f3",
-                    "mixHash" : "ba714546ae31151b4e94ddc5d9250a15c0777bb6da7e486d3bca9714da3109e7",
-                    "nonce" : "fc69fffd1296538a",
+                    "hash" : "0xb9614419e291b812c4c85963ec5b8286c07d3f6acc32c797c9b0802aaeff98f7",
+                    "mixHash" : "0xef1c37079cfa4c099cc8e61f3344a6ed660aa5f1e51bb803babcb1a88aadc135",
+                    "nonce" : "0x9070eac4e80eda64",
                     "number" : "0x01",
-                    "parentHash" : "6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
-                    "receiptTrie" : "f30a45b5d1dbd855ea3959fea5b45818688b0dca4f44e22344b7c70c3c7a2cfb",
-                    "stateRoot" : "5239a49d0739ca7f66a76ed1821c5d321800606aa139787ee25ec521a4a81c8d",
+                    "parentHash" : "0x6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
+                    "receiptTrie" : "0xf30a45b5d1dbd855ea3959fea5b45818688b0dca4f44e22344b7c70c3c7a2cfb",
+                    "stateRoot" : "0x5239a49d0739ca7f66a76ed1821c5d321800606aa139787ee25ec521a4a81c8d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05239a49d0739ca7f66a76ed1821c5d321800606aa139787ee25ec521a4a81c8da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f30a45b5d1dbd855ea3959fea5b45818688b0dca4f44e22344b7c70c3c7a2cfbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0ba714546ae31151b4e94ddc5d9250a15c0777bb6da7e486d3bca9714da3109e788fc69fffd1296538af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05239a49d0739ca7f66a76ed1821c5d321800606aa139787ee25ec521a4a81c8da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f30a45b5d1dbd855ea3959fea5b45818688b0dca4f44e22344b7c70c3c7a2cfbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0ef1c37079cfa4c099cc8e61f3344a6ed660aa5f1e51bb803babcb1a88aadc135889070eac4e80eda64f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -192,28 +202,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "d68672c2a76837125043a3efcc70dd7d51135b01d601a604dc02a2de78faa9fb",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd68672c2a76837125043a3efcc70dd7d51135b01d601a604dc02a2de78faa9fb",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d68672c2a76837125043a3efcc70dd7d51135b01d601a604dc02a2de78faa9fba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8c9560e2a3cc2c0a68117257841c7eaaf9edb95f8cf875de50e8526eed74c6f3",
+        "lastblockhash" : "0xb9614419e291b812c4c85963ec5b8286c07d3f6acc32c797c9b0802aaeff98f7",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -221,7 +231,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640001",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
@@ -238,67 +248,67 @@
                     "0x07" : "0x03"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f804a3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ffb5d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -306,36 +316,41 @@
         }
     },
     "callcallcodecallcode_011_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "da22cac32d1a7f2679943c919dced820376e350298447b2dc1fefe1b3dbc6a9f",
-                    "mixHash" : "5eccf12ec4a63e609dadab14cc64f715fcdad2dac995b24d56b611c2d6c9ea43",
-                    "nonce" : "ac9879fa8ba86ccb",
+                    "hash" : "0xdfd2b8e043e43fb06b1c0ccac4b30eb0a0275e514a191dd9ea8441e3f8feff05",
+                    "mixHash" : "0x8060beb661f1899b2dcebdd55d28d8642f8ff7b64ef1ea453b4ee8f373cf22db",
+                    "nonce" : "0xea02549500052f3c",
                     "number" : "0x01",
-                    "parentHash" : "6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
-                    "receiptTrie" : "ec1868396531e1fbd45ba1648747743823f6906ed6749e9a55fd694b54a0a5f5",
-                    "stateRoot" : "63c713218f4d7c62fe3b98bac70c1d0626a0f4ace1fc227801143845014823a5",
+                    "parentHash" : "0x6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
+                    "receiptTrie" : "0xec1868396531e1fbd45ba1648747743823f6906ed6749e9a55fd694b54a0a5f5",
+                    "stateRoot" : "0x63c713218f4d7c62fe3b98bac70c1d0626a0f4ace1fc227801143845014823a5",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063c713218f4d7c62fe3b98bac70c1d0626a0f4ace1fc227801143845014823a5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ec1868396531e1fbd45ba1648747743823f6906ed6749e9a55fd694b54a0a5f5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a05eccf12ec4a63e609dadab14cc64f715fcdad2dac995b24d56b611c2d6c9ea4388ac9879fa8ba86ccbf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063c713218f4d7c62fe3b98bac70c1d0626a0f4ace1fc227801143845014823a5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ec1868396531e1fbd45ba1648747743823f6906ed6749e9a55fd694b54a0a5f5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a08060beb661f1899b2dcebdd55d28d8642f8ff7b64ef1ea453b4ee8f373cf22db88ea02549500052f3cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -345,28 +360,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "d68672c2a76837125043a3efcc70dd7d51135b01d601a604dc02a2de78faa9fb",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd68672c2a76837125043a3efcc70dd7d51135b01d601a604dc02a2de78faa9fb",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d68672c2a76837125043a3efcc70dd7d51135b01d601a604dc02a2de78faa9fba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "da22cac32d1a7f2679943c919dced820376e350298447b2dc1fefe1b3dbc6a9f",
+        "lastblockhash" : "0xdfd2b8e043e43fb06b1c0ccac4b30eb0a0275e514a191dd9ea8441e3f8feff05",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -374,7 +389,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640001",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
@@ -391,67 +406,67 @@
                     "0x07" : "0x03"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7fce7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7600319",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -459,36 +474,41 @@
         }
     },
     "callcallcodecallcode_011_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "dafa4aafaf4e6c301465a258c0308835b2188b2f3feec62883b71131df1226e3",
-                    "mixHash" : "134ed61ba95000679f7a40d61306e16f50418674bafcef39bbfe408708fb2601",
-                    "nonce" : "ca2d30b3fed7cb0f",
+                    "hash" : "0x3017b64c810cb3e5603e05bf0d6c62e09f71672f2b30cc2d8f5329ba661d75b3",
+                    "mixHash" : "0x8a9e89634dbbff3c07374952ea234c62cfce36e3312b6c6ebce5cbb1397eee93",
+                    "nonce" : "0xf3562fb9bd94cf19",
                     "number" : "0x01",
-                    "parentHash" : "6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
-                    "receiptTrie" : "ec1868396531e1fbd45ba1648747743823f6906ed6749e9a55fd694b54a0a5f5",
-                    "stateRoot" : "63c713218f4d7c62fe3b98bac70c1d0626a0f4ace1fc227801143845014823a5",
+                    "parentHash" : "0x6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
+                    "receiptTrie" : "0xec1868396531e1fbd45ba1648747743823f6906ed6749e9a55fd694b54a0a5f5",
+                    "stateRoot" : "0x63c713218f4d7c62fe3b98bac70c1d0626a0f4ace1fc227801143845014823a5",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063c713218f4d7c62fe3b98bac70c1d0626a0f4ace1fc227801143845014823a5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ec1868396531e1fbd45ba1648747743823f6906ed6749e9a55fd694b54a0a5f5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0134ed61ba95000679f7a40d61306e16f50418674bafcef39bbfe408708fb260188ca2d30b3fed7cb0ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063c713218f4d7c62fe3b98bac70c1d0626a0f4ace1fc227801143845014823a5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ec1868396531e1fbd45ba1648747743823f6906ed6749e9a55fd694b54a0a5f5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a08a9e89634dbbff3c07374952ea234c62cfce36e3312b6c6ebce5cbb1397eee9388f3562fb9bd94cf19f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -498,28 +518,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "d68672c2a76837125043a3efcc70dd7d51135b01d601a604dc02a2de78faa9fb",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd68672c2a76837125043a3efcc70dd7d51135b01d601a604dc02a2de78faa9fb",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d68672c2a76837125043a3efcc70dd7d51135b01d601a604dc02a2de78faa9fba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "dafa4aafaf4e6c301465a258c0308835b2188b2f3feec62883b71131df1226e3",
+        "lastblockhash" : "0x3017b64c810cb3e5603e05bf0d6c62e09f71672f2b30cc2d8f5329ba661d75b3",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
@@ -527,7 +547,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640001",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
@@ -544,67 +564,232 @@
                     "0x07" : "0x03"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7fce7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7600319",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0xa18f31cda36a787b97352c917d68097b42b20cd7922699bf60fc2495fcff23d9",
+                    "mixHash" : "0xda7eb6d1f904a205d1eb996ceed44579472dd31dc2be113f7955022071c0977d",
+                    "nonce" : "0xc4c81099f27aa218",
+                    "number" : "0x01",
+                    "parentHash" : "0x6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0xd8fb01948c728f4cba827b3fca599f54867f7bc0cb1ce060c5b4722f6cbf48bf",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a06598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8fb01948c728f4cba827b3fca599f54867f7bc0cb1ce060c5b4722f6cbf48bfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0da7eb6d1f904a205d1eb996ceed44579472dd31dc2be113f7955022071c0977d88c4c81099f27aa218f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xa18f31cda36a787b97352c917d68097b42b20cd7922699bf60fc2495fcff23d9",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0.json
index 8a56dad89..f77eadf9c 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcodecallcode_ABCB_RECURSIVE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "cbc163a932616cde3e6cde6dbbe26c2f1bdc2d5eaf1d2bff58632ef3a0e4f351",
-                    "mixHash" : "b53be2929da510b2739e26b697e0bd898d7e37194979f0d43c1d9eb615f6dff5",
-                    "nonce" : "aebae9c285478653",
+                    "hash" : "0xffe643c7a328a2385b6297d96c7019cafe0c841ef15f08d497474a2aefca6c65",
+                    "mixHash" : "0xb69039a0d6a3a978a4faaeb9a95d8a937bd55a56e8d22379dd62c792c428e2cd",
+                    "nonce" : "0xa009b3a07c27718e",
                     "number" : "0x01",
-                    "parentHash" : "2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
-                    "receiptTrie" : "f52f9578c5e5805fa8c001aa8b2c0dfd49635fd73479f8b06d71b628a613c90a",
-                    "stateRoot" : "98aecff1cb9e0e77919694fc4efa5e8beb212894f7e87765496ba6455543ba62",
+                    "parentHash" : "0x2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
+                    "receiptTrie" : "0xf52f9578c5e5805fa8c001aa8b2c0dfd49635fd73479f8b06d71b628a613c90a",
+                    "stateRoot" : "0x98aecff1cb9e0e77919694fc4efa5e8beb212894f7e87765496ba6455543ba62",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a02c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa098aecff1cb9e0e77919694fc4efa5e8beb212894f7e87765496ba6455543ba62a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0f52f9578c5e5805fa8c001aa8b2c0dfd49635fd73479f8b06d71b628a613c90ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0b53be2929da510b2739e26b697e0bd898d7e37194979f0d43c1d9eb615f6dff588aebae9c285478653f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a02c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa098aecff1cb9e0e77919694fc4efa5e8beb212894f7e87765496ba6455543ba62a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0f52f9578c5e5805fa8c001aa8b2c0dfd49635fd73479f8b06d71b628a613c90ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0b69039a0d6a3a978a4faaeb9a95d8a937bd55a56e8d22379dd62c792c428e2cd88a009b3a07c27718ef863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e25de8c06d98fce6a69a4acb9eba36d8cfcbc5f9e1022f0bc6796977f4db2525",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe25de8c06d98fce6a69a4acb9eba36d8cfcbc5f9e1022f0bc6796977f4db2525",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e25de8c06d98fce6a69a4acb9eba36d8cfcbc5f9e1022f0bc6796977f4db2525a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "cbc163a932616cde3e6cde6dbbe26c2f1bdc2d5eaf1d2bff58632ef3a0e4f351",
+        "lastblockhash" : "0xffe643c7a328a2385b6297d96c7019cafe0c841ef15f08d497474a2aefca6c65",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
@@ -76,53 +81,53 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fcab7e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5482",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -130,36 +135,41 @@
         }
     },
     "callcallcodecallcode_ABCB_RECURSIVE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "002399c92ba26f339b6d6c02fc8ba58c17d2393a3b4144877250ef221489ab0a",
-                    "mixHash" : "8d1cefa84b00e722fc0a4dbcf560858909803af45984bfd830025feb93d7a91e",
-                    "nonce" : "2953487083d7aea8",
+                    "hash" : "0xf6245919304422aee3b89f89333a47f60eedc2cdace048d4033824ca83da74df",
+                    "mixHash" : "0xe054b7ca27f877c9d2f4e034049883a3e934ae92381aabde1dced4f009230f20",
+                    "nonce" : "0x5eb4dfe9d1438a7d",
                     "number" : "0x01",
-                    "parentHash" : "2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
-                    "receiptTrie" : "f52f9578c5e5805fa8c001aa8b2c0dfd49635fd73479f8b06d71b628a613c90a",
-                    "stateRoot" : "98aecff1cb9e0e77919694fc4efa5e8beb212894f7e87765496ba6455543ba62",
+                    "parentHash" : "0x2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
+                    "receiptTrie" : "0xf52f9578c5e5805fa8c001aa8b2c0dfd49635fd73479f8b06d71b628a613c90a",
+                    "stateRoot" : "0x98aecff1cb9e0e77919694fc4efa5e8beb212894f7e87765496ba6455543ba62",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a02c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa098aecff1cb9e0e77919694fc4efa5e8beb212894f7e87765496ba6455543ba62a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0f52f9578c5e5805fa8c001aa8b2c0dfd49635fd73479f8b06d71b628a613c90ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a08d1cefa84b00e722fc0a4dbcf560858909803af45984bfd830025feb93d7a91e882953487083d7aea8f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a02c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa098aecff1cb9e0e77919694fc4efa5e8beb212894f7e87765496ba6455543ba62a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0f52f9578c5e5805fa8c001aa8b2c0dfd49635fd73479f8b06d71b628a613c90ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0e054b7ca27f877c9d2f4e034049883a3e934ae92381aabde1dced4f009230f20885eb4dfe9d1438a7df863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -169,28 +179,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e25de8c06d98fce6a69a4acb9eba36d8cfcbc5f9e1022f0bc6796977f4db2525",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe25de8c06d98fce6a69a4acb9eba36d8cfcbc5f9e1022f0bc6796977f4db2525",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e25de8c06d98fce6a69a4acb9eba36d8cfcbc5f9e1022f0bc6796977f4db2525a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "002399c92ba26f339b6d6c02fc8ba58c17d2393a3b4144877250ef221489ab0a",
+        "lastblockhash" : "0xf6245919304422aee3b89f89333a47f60eedc2cdace048d4033824ca83da74df",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
@@ -198,7 +208,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
@@ -206,53 +216,53 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fcab7e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5482",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -260,36 +270,41 @@
         }
     },
     "callcallcodecallcode_ABCB_RECURSIVE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "0bb1a80818acb781476f0e5c3bede2e1ab9137eca59291214b99c75d5c17b1ea",
-                    "mixHash" : "4b1e210ef3b5e091016b0508c3a9d79374fa608e6f879b77ba4d40ce5b9ff261",
-                    "nonce" : "7cc09889dffda76f",
+                    "hash" : "0x20bf51da65426b3b82bad42d3eeb171132e61eba9e12e9275dda314d91f4a9d5",
+                    "mixHash" : "0xa79e6c668e4aed242dd0493dd7d642ebb3150a00ccb7ac98a33d79e1acdd606a",
+                    "nonce" : "0xb19eaf630ab65fec",
                     "number" : "0x01",
-                    "parentHash" : "2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
-                    "receiptTrie" : "9dc3c471d545a0786f6e477f612577f69e23c19b3690b5bbf07e8bd21168765a",
-                    "stateRoot" : "b87f088006c2e05780960fe2ec9706ad70870ed58e7c48dd9bac154d79e72966",
+                    "parentHash" : "0x2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
+                    "receiptTrie" : "0x9dc3c471d545a0786f6e477f612577f69e23c19b3690b5bbf07e8bd21168765a",
+                    "stateRoot" : "0xb87f088006c2e05780960fe2ec9706ad70870ed58e7c48dd9bac154d79e72966",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a02c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b87f088006c2e05780960fe2ec9706ad70870ed58e7c48dd9bac154d79e72966a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a09dc3c471d545a0786f6e477f612577f69e23c19b3690b5bbf07e8bd21168765ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a04b1e210ef3b5e091016b0508c3a9d79374fa608e6f879b77ba4d40ce5b9ff261887cc09889dffda76ff863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a02c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b87f088006c2e05780960fe2ec9706ad70870ed58e7c48dd9bac154d79e72966a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a09dc3c471d545a0786f6e477f612577f69e23c19b3690b5bbf07e8bd21168765ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0a79e6c668e4aed242dd0493dd7d642ebb3150a00ccb7ac98a33d79e1acdd606a88b19eaf630ab65fecf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -299,28 +314,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e25de8c06d98fce6a69a4acb9eba36d8cfcbc5f9e1022f0bc6796977f4db2525",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe25de8c06d98fce6a69a4acb9eba36d8cfcbc5f9e1022f0bc6796977f4db2525",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e25de8c06d98fce6a69a4acb9eba36d8cfcbc5f9e1022f0bc6796977f4db2525a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0bb1a80818acb781476f0e5c3bede2e1ab9137eca59291214b99c75d5c17b1ea",
+        "lastblockhash" : "0x20bf51da65426b3b82bad42d3eeb171132e61eba9e12e9275dda314d91f4a9d5",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
@@ -328,7 +343,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
@@ -336,53 +351,53 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fca3c2",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5c3e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -390,36 +405,41 @@
         }
     },
     "callcallcodecallcode_ABCB_RECURSIVE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "287a5c8ba230145b4fbf7bad3301528e2167ef1b28d2af2fcfda77d214cee4b8",
-                    "mixHash" : "637a9f0df1f72dbcb5ecfcd6b831601390f4feed50311c947f6db331929d5581",
-                    "nonce" : "e270aa52565c0ac9",
+                    "hash" : "0x5fa70ce7ffed49d99f52f58a3e17d088ece201e4be2afc04a4103de54defd446",
+                    "mixHash" : "0xc1710818d555f5edcaf3e36b19248e2625c77c6b8ffaefef092771cb9ffcb55a",
+                    "nonce" : "0x557217f69e8e9c90",
                     "number" : "0x01",
-                    "parentHash" : "2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
-                    "receiptTrie" : "9dc3c471d545a0786f6e477f612577f69e23c19b3690b5bbf07e8bd21168765a",
-                    "stateRoot" : "b87f088006c2e05780960fe2ec9706ad70870ed58e7c48dd9bac154d79e72966",
+                    "parentHash" : "0x2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
+                    "receiptTrie" : "0x9dc3c471d545a0786f6e477f612577f69e23c19b3690b5bbf07e8bd21168765a",
+                    "stateRoot" : "0xb87f088006c2e05780960fe2ec9706ad70870ed58e7c48dd9bac154d79e72966",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a02c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b87f088006c2e05780960fe2ec9706ad70870ed58e7c48dd9bac154d79e72966a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a09dc3c471d545a0786f6e477f612577f69e23c19b3690b5bbf07e8bd21168765ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0637a9f0df1f72dbcb5ecfcd6b831601390f4feed50311c947f6db331929d558188e270aa52565c0ac9f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a02c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b87f088006c2e05780960fe2ec9706ad70870ed58e7c48dd9bac154d79e72966a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a09dc3c471d545a0786f6e477f612577f69e23c19b3690b5bbf07e8bd21168765ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0c1710818d555f5edcaf3e36b19248e2625c77c6b8ffaefef092771cb9ffcb55a88557217f69e8e9c90f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -429,28 +449,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e25de8c06d98fce6a69a4acb9eba36d8cfcbc5f9e1022f0bc6796977f4db2525",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe25de8c06d98fce6a69a4acb9eba36d8cfcbc5f9e1022f0bc6796977f4db2525",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e25de8c06d98fce6a69a4acb9eba36d8cfcbc5f9e1022f0bc6796977f4db2525a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "287a5c8ba230145b4fbf7bad3301528e2167ef1b28d2af2fcfda77d214cee4b8",
+        "lastblockhash" : "0x5fa70ce7ffed49d99f52f58a3e17d088ece201e4be2afc04a4103de54defd446",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
@@ -458,7 +478,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
@@ -466,53 +486,195 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fca3c2",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5c3e",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xbb65453a83106fa4ea0c6e7c668c7f94f7e4aea47f5d5b858b26c5a813d378dd",
+                    "mixHash" : "0x85980e88e84c570c39736c539134391f8e0c99226868734f6ae6fb8fa14a6024",
+                    "nonce" : "0x19424357ea11b596",
+                    "number" : "0x01",
+                    "parentHash" : "0x2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0x984df308e04177bef7b46b0ec5dec320e36dbef9040603228489cd55e24c1609",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a02c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0984df308e04177bef7b46b0ec5dec320e36dbef9040603228489cd55e24c1609a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a085980e88e84c570c39736c539134391f8e0c99226868734f6ae6fb8fa14a60248819424357ea11b596f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "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" : "0xbb65453a83106fa4ea0c6e7c668c7f94f7e4aea47f5d5b858b26c5a813d378dd",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall_d0g0v0.json
index d9973ae08..bb8c3aa1f 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodeDynamicCode2SelfCall_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeDynamicCode2SelfCall_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016e48",
-                    "hash" : "243ce92c1628f5380dbb9739cfaeff09a3082c259045231af8bd013f0a3496b5",
-                    "mixHash" : "bc68cd465ee1b0999a5fadda38d4e436612c6bf4e767a66e975e1310b415aaa1",
-                    "nonce" : "2ae2a2f23de356c1",
+                    "hash" : "0xff51a4af11fc85b912a66a12176de31fe6cbf5067f00ec4a11a5fd442019b76d",
+                    "mixHash" : "0x43bcdc908e80010f6adba8b7d6fb893e5935692e25d535389702ed14761ef0a8",
+                    "nonce" : "0x7babec8fd52232b7",
                     "number" : "0x01",
-                    "parentHash" : "ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
-                    "receiptTrie" : "918cdb7d4b07f2d65d39b34f50662603527deafc3e17028e56f41537ff7121b6",
-                    "stateRoot" : "35fd6ed99d98ffd10feff25a58cdb45565d1186af5cac9ea4457889d58ddf331",
+                    "parentHash" : "0xac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
+                    "receiptTrie" : "0x918cdb7d4b07f2d65d39b34f50662603527deafc3e17028e56f41537ff7121b6",
+                    "stateRoot" : "0x35fd6ed99d98ffd10feff25a58cdb45565d1186af5cac9ea4457889d58ddf331",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035fd6ed99d98ffd10feff25a58cdb45565d1186af5cac9ea4457889d58ddf331a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0918cdb7d4b07f2d65d39b34f50662603527deafc3e17028e56f41537ff7121b6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e488203e880a0bc68cd465ee1b0999a5fadda38d4e436612c6bf4e767a66e975e1310b415aaa1882ae2a2f23de356c1f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035fd6ed99d98ffd10feff25a58cdb45565d1186af5cac9ea4457889d58ddf331a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0918cdb7d4b07f2d65d39b34f50662603527deafc3e17028e56f41537ff7121b6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e488203e880a043bcdc908e80010f6adba8b7d6fb893e5935692e25d535389702ed14761ef0a8887babec8fd52232b7f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,69 +44,69 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a3cf5c73d59cb03fa004d9f8aa3d3c009dff3a976452f4b2a68697a34f203db2",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3cf5c73d59cb03fa004d9f8aa3d3c009dff3a976452f4b2a68697a34f203db2",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3cf5c73d59cb03fa004d9f8aa3d3c009dff3a976452f4b2a68697a34f203db2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "243ce92c1628f5380dbb9739cfaeff09a3082c259045231af8bd013f0a3496b5",
+        "lastblockhash" : "0xff51a4af11fc85b912a66a12176de31fe6cbf5067f00ec4a11a5fd442019b76d",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e626000527f0186a0f2600b5533600c55000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0b" : "0x01",
                     "0x0c" : "0x1000000000000000000000000000000000000000"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56e48",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbf91b8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e626000527f0186a0f2600b5533600c55000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -109,36 +114,41 @@
         }
     },
     "callcodeDynamicCode2SelfCall_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeDynamicCode2SelfCall_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016e48",
-                    "hash" : "82707d7ba4a4207720795ccfa499f83390562e92a6ac6e098b5683b4e0bc4e0b",
-                    "mixHash" : "287bf79cb90eb4dc8e36682f910c31b0d837c3808b4c31a7c4cdeee4fdcd5cca",
-                    "nonce" : "5398ae0690a13f7b",
+                    "hash" : "0x68b09c877b256f31eb2b12dad52bf2649896ffe1c3e0ad23b3efdb2201c948f2",
+                    "mixHash" : "0x0ca110a3e846f7866e7b521eee2917e310deeb844c7897d478ef31ce1e19bc9e",
+                    "nonce" : "0x6c9b4f2bb3673479",
                     "number" : "0x01",
-                    "parentHash" : "ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
-                    "receiptTrie" : "f0bac29143ab50e11d47898c5774b1678d00f06374483ccb768609f52c6ac58a",
-                    "stateRoot" : "ac2fd109317958259b7c054ae1334fcbd38f88a1b5d396c77c6af92f6afcef5b",
+                    "parentHash" : "0xac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
+                    "receiptTrie" : "0xf0bac29143ab50e11d47898c5774b1678d00f06374483ccb768609f52c6ac58a",
+                    "stateRoot" : "0xac2fd109317958259b7c054ae1334fcbd38f88a1b5d396c77c6af92f6afcef5b",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2fd109317958259b7c054ae1334fcbd38f88a1b5d396c77c6af92f6afcef5ba074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0f0bac29143ab50e11d47898c5774b1678d00f06374483ccb768609f52c6ac58ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e488203e880a0287bf79cb90eb4dc8e36682f910c31b0d837c3808b4c31a7c4cdeee4fdcd5cca885398ae0690a13f7bf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2fd109317958259b7c054ae1334fcbd38f88a1b5d396c77c6af92f6afcef5ba074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0f0bac29143ab50e11d47898c5774b1678d00f06374483ccb768609f52c6ac58ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e488203e880a00ca110a3e846f7866e7b521eee2917e310deeb844c7897d478ef31ce1e19bc9e886c9b4f2bb3673479f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -148,69 +158,69 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a3cf5c73d59cb03fa004d9f8aa3d3c009dff3a976452f4b2a68697a34f203db2",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3cf5c73d59cb03fa004d9f8aa3d3c009dff3a976452f4b2a68697a34f203db2",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3cf5c73d59cb03fa004d9f8aa3d3c009dff3a976452f4b2a68697a34f203db2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "82707d7ba4a4207720795ccfa499f83390562e92a6ac6e098b5683b4e0bc4e0b",
+        "lastblockhash" : "0x68b09c877b256f31eb2b12dad52bf2649896ffe1c3e0ad23b3efdb2201c948f2",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e626000527f0186a0f2600b5533600c55000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x0b" : "0x01",
                     "0x0c" : "0x1000000000000000000000000000000000000000"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56e48",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbf91b8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e626000527f0186a0f2600b5533600c55000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -218,36 +228,41 @@
         }
     },
     "callcodeDynamicCode2SelfCall_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeDynamicCode2SelfCall_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016bb4",
-                    "hash" : "13af6f1081c6f19f0fe4398b4be9405ad974bc6d1418c4d5a00e22015f0a57bd",
-                    "mixHash" : "666bfb04575028d7cb498519dda98cb294d6007e1488e7afa34037b8c75bfd0b",
-                    "nonce" : "0462f9a9c016a959",
+                    "hash" : "0x57f4ae857fd6ff74b424f434375abf415fa093f0c0724f84ddce76e0d4c44ef4",
+                    "mixHash" : "0x4ea72ac49a5004602ac883bdea57d11b3c318c3f81daf296aee96cf2abb58cbf",
+                    "nonce" : "0x8347065fa04984f0",
                     "number" : "0x01",
-                    "parentHash" : "ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
-                    "receiptTrie" : "9a61f29def895e691bbb86381fedc4e377dff19876e4485d51f58cea95f6e9b4",
-                    "stateRoot" : "01012d8fa832a7e7bbe7837fe1251c79424cac212ed1e96eaf84cd6f3b42d477",
+                    "parentHash" : "0xac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
+                    "receiptTrie" : "0x9a61f29def895e691bbb86381fedc4e377dff19876e4485d51f58cea95f6e9b4",
+                    "stateRoot" : "0x01012d8fa832a7e7bbe7837fe1251c79424cac212ed1e96eaf84cd6f3b42d477",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001012d8fa832a7e7bbe7837fe1251c79424cac212ed1e96eaf84cd6f3b42d477a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a09a61f29def895e691bbb86381fedc4e377dff19876e4485d51f58cea95f6e9b4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb48203e880a0666bfb04575028d7cb498519dda98cb294d6007e1488e7afa34037b8c75bfd0b880462f9a9c016a959f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001012d8fa832a7e7bbe7837fe1251c79424cac212ed1e96eaf84cd6f3b42d477a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a09a61f29def895e691bbb86381fedc4e377dff19876e4485d51f58cea95f6e9b4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb48203e880a04ea72ac49a5004602ac883bdea57d11b3c318c3f81daf296aee96cf2abb58cbf888347065fa04984f0f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -257,69 +272,69 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a3cf5c73d59cb03fa004d9f8aa3d3c009dff3a976452f4b2a68697a34f203db2",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3cf5c73d59cb03fa004d9f8aa3d3c009dff3a976452f4b2a68697a34f203db2",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3cf5c73d59cb03fa004d9f8aa3d3c009dff3a976452f4b2a68697a34f203db2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "13af6f1081c6f19f0fe4398b4be9405ad974bc6d1418c4d5a00e22015f0a57bd",
+        "lastblockhash" : "0x57f4ae857fd6ff74b424f434375abf415fa093f0c0724f84ddce76e0d4c44ef4",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e626000527f0186a0f2600b5533600c55000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0b" : "0x01",
                     "0x0c" : "0x1000000000000000000000000000000000000000"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56bb4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbf944c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e626000527f0186a0f2600b5533600c55000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -327,36 +342,41 @@
         }
     },
     "callcodeDynamicCode2SelfCall_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeDynamicCode2SelfCall_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016bb4",
-                    "hash" : "390bc2d745f1dff413245b74daf491ab9be6280711ffb800f330e1909049a8c8",
-                    "mixHash" : "441f15135783c7fe86a6711e1db55c1107d60cece871637e5fe3e4358aef61e5",
-                    "nonce" : "9cbce37bf8aff814",
+                    "hash" : "0x9bd845e77a8c96915649885112c704b07195d2bed949b4f342a8f36ea74ee8b4",
+                    "mixHash" : "0x046ca26ca442f6dce2ffa32fe8f65d039b020d275d6bc23974c6e398a694c5d6",
+                    "nonce" : "0x25322ee8df0fa372",
                     "number" : "0x01",
-                    "parentHash" : "ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
-                    "receiptTrie" : "9a61f29def895e691bbb86381fedc4e377dff19876e4485d51f58cea95f6e9b4",
-                    "stateRoot" : "01012d8fa832a7e7bbe7837fe1251c79424cac212ed1e96eaf84cd6f3b42d477",
+                    "parentHash" : "0xac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
+                    "receiptTrie" : "0x9a61f29def895e691bbb86381fedc4e377dff19876e4485d51f58cea95f6e9b4",
+                    "stateRoot" : "0x01012d8fa832a7e7bbe7837fe1251c79424cac212ed1e96eaf84cd6f3b42d477",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001012d8fa832a7e7bbe7837fe1251c79424cac212ed1e96eaf84cd6f3b42d477a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a09a61f29def895e691bbb86381fedc4e377dff19876e4485d51f58cea95f6e9b4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb48203e880a0441f15135783c7fe86a6711e1db55c1107d60cece871637e5fe3e4358aef61e5889cbce37bf8aff814f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001012d8fa832a7e7bbe7837fe1251c79424cac212ed1e96eaf84cd6f3b42d477a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a09a61f29def895e691bbb86381fedc4e377dff19876e4485d51f58cea95f6e9b4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb48203e880a0046ca26ca442f6dce2ffa32fe8f65d039b020d275d6bc23974c6e398a694c5d68825322ee8df0fa372f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -366,69 +386,190 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a3cf5c73d59cb03fa004d9f8aa3d3c009dff3a976452f4b2a68697a34f203db2",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3cf5c73d59cb03fa004d9f8aa3d3c009dff3a976452f4b2a68697a34f203db2",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3cf5c73d59cb03fa004d9f8aa3d3c009dff3a976452f4b2a68697a34f203db2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "390bc2d745f1dff413245b74daf491ab9be6280711ffb800f330e1909049a8c8",
+        "lastblockhash" : "0x9bd845e77a8c96915649885112c704b07195d2bed949b4f342a8f36ea74ee8b4",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e626000527f0186a0f2600b5533600c55000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0b" : "0x01",
                     "0x0c" : "0x1000000000000000000000000000000000000000"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56bb4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbf944c",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x2710",
+                "code" : "0x7f604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e626000527f0186a0f2600b5533600c55000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc10000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeDynamicCode2SelfCall_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeDynamicCode2SelfCall_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x016e48",
+                    "hash" : "0x8c6c5ea5fdc41f0f75b7d1b3e7e1a3deeb888fd91d64408055ea641c92f27087",
+                    "mixHash" : "0x59f9a69111dd5d8e00f68df691d3bfcf7cb0c0b071e7a8ec298e05251341f9c7",
+                    "nonce" : "0x71fb12c44f7a089c",
+                    "number" : "0x01",
+                    "parentHash" : "0xac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
+                    "receiptTrie" : "0xd55bcfdfc833b80a76f004e2763d06bdec5b3536fba13adcfa0495b4dc5f4073",
+                    "stateRoot" : "0xceed895cec6abc7c758f1ef80ca016c65b7c460e21702de5f3bf33f34bdfb099",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ceed895cec6abc7c758f1ef80ca016c65b7c460e21702de5f3bf33f34bdfb099a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0d55bcfdfc833b80a76f004e2763d06bdec5b3536fba13adcfa0495b4dc5f4073b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e488203e880a059f9a69111dd5d8e00f68df691d3bfcf7cb0c0b071e7a8ec298e05251341f9c78871fb12c44f7a089cf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "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" : "0x8c6c5ea5fdc41f0f75b7d1b3e7e1a3deeb888fd91d64408055ea641c92f27087",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e626000527f0186a0f2600b5533600c55000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeDynamicCode.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeDynamicCode_d0g0v0.json
index 8b30894b6..2d79ec861 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeDynamicCode.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeDynamicCode_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodeDynamicCode_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeDynamicCode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x028ec9",
-                    "hash" : "e32e69eba6e6750d3c177b392027992e3a118c74a6ff83cfd2d252f1d85c2321",
-                    "mixHash" : "7b8fdacf840fdd4e5a8e672f7735da158d6dc538a222a7f9e1c0b8df0fec2f1a",
-                    "nonce" : "21ce292c508cd1d3",
+                    "hash" : "0x72a967e936e15a4bc73ef6fb0d08bad78720e4877c9809df49cbab99162201c7",
+                    "mixHash" : "0x3841c6077fc31a71bafaf41d88a7ed8e361af89a50ab97b4fecf13aae5bcbb5a",
+                    "nonce" : "0x69e382e6807d305f",
                     "number" : "0x01",
-                    "parentHash" : "b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
-                    "receiptTrie" : "1411a5917604fce1b80e269bdf13e4bdca7aeb97603b7ddfa0b0af6422966a20",
-                    "stateRoot" : "4b4926daa94461926cefcc56f180a7c06b5ae55be11e116dfebb12bc932d442d",
+                    "parentHash" : "0xb81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
+                    "receiptTrie" : "0x1411a5917604fce1b80e269bdf13e4bdca7aeb97603b7ddfa0b0af6422966a20",
+                    "stateRoot" : "0x4b4926daa94461926cefcc56f180a7c06b5ae55be11e116dfebb12bc932d442d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b4926daa94461926cefcc56f180a7c06b5ae55be11e116dfebb12bc932d442da074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a01411a5917604fce1b80e269bdf13e4bdca7aeb97603b7ddfa0b0af6422966a20b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028ec98203e880a07b8fdacf840fdd4e5a8e672f7735da158d6dc538a222a7f9e1c0b8df0fec2f1a8821ce292c508cd1d3f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b4926daa94461926cefcc56f180a7c06b5ae55be11e116dfebb12bc932d442da074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a01411a5917604fce1b80e269bdf13e4bdca7aeb97603b7ddfa0b0af6422966a20b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028ec98203e880a03841c6077fc31a71bafaf41d88a7ed8e361af89a50ab97b4fecf13aae5bcbb5a8869e382e6807d305ff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,44 +44,44 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1cc77f786d486703dea35efbf2468ff7b1c252322e8d47e848db0231e2254316",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1cc77f786d486703dea35efbf2468ff7b1c252322e8d47e848db0231e2254316",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc77f786d486703dea35efbf2468ff7b1c252322e8d47e848db0231e2254316a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e32e69eba6e6750d3c177b392027992e3a118c74a6ff83cfd2d252f1d85c2321",
+        "lastblockhash" : "0x72a967e936e15a4bc73ef6fb0d08bad78720e4877c9809df49cbab99162201c7",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6626020527f0186a0f2600b5500000000000000000000000000000000000000000000000000604052606060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x01",
@@ -85,21 +90,21 @@
                     "0x14" : "0x13136008b64ff592819b2fa6d43f2835c452020e"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f68ec9",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbe7137",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
+            "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
                 "balance" : "0x01",
                 "code" : "0x600160005533601455",
                 "nonce" : "0x00",
@@ -108,23 +113,23 @@
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6626020527f0186a0f2600b5500000000000000000000000000000000000000000000000000604052606060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -132,36 +137,41 @@
         }
     },
     "callcodeDynamicCode_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeDynamicCode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01f27e",
-                    "hash" : "62c9599489320f980e4a8620f3a065ddaa56d40a95262513f199f97f5c71c94f",
-                    "mixHash" : "f3dd04004ceaf6e003f70605fdd3ae60e165b3deb52a6adcac03717a13bae904",
-                    "nonce" : "6eb2195b3d5ba506",
+                    "hash" : "0x2ae51b3340fc9db732d9af0a82d326fa53047129b7b4beeb0c09677c23735eb2",
+                    "mixHash" : "0x1cb74a22dcc8990f82679b568450b9cee3816115761ef68df191f87b81951190",
+                    "nonce" : "0x1f03b9e2feec55b0",
                     "number" : "0x01",
-                    "parentHash" : "b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
-                    "receiptTrie" : "77058097a8d016ca6deedd68f45a2fee16a2ed65889f8cecac12e7f9046a3ae9",
-                    "stateRoot" : "ace633cd2ae2c84533298d0c1a82a8d476d5b6d560e6d9ecdf33fdae2eaba620",
+                    "parentHash" : "0xb81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
+                    "receiptTrie" : "0x77058097a8d016ca6deedd68f45a2fee16a2ed65889f8cecac12e7f9046a3ae9",
+                    "stateRoot" : "0xace633cd2ae2c84533298d0c1a82a8d476d5b6d560e6d9ecdf33fdae2eaba620",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ace633cd2ae2c84533298d0c1a82a8d476d5b6d560e6d9ecdf33fdae2eaba620a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a077058097a8d016ca6deedd68f45a2fee16a2ed65889f8cecac12e7f9046a3ae9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27e8203e880a0f3dd04004ceaf6e003f70605fdd3ae60e165b3deb52a6adcac03717a13bae904886eb2195b3d5ba506f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ace633cd2ae2c84533298d0c1a82a8d476d5b6d560e6d9ecdf33fdae2eaba620a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a077058097a8d016ca6deedd68f45a2fee16a2ed65889f8cecac12e7f9046a3ae9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27e8203e880a01cb74a22dcc8990f82679b568450b9cee3816115761ef68df191f87b81951190881f03b9e2feec55b0f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -171,90 +181,90 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1cc77f786d486703dea35efbf2468ff7b1c252322e8d47e848db0231e2254316",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1cc77f786d486703dea35efbf2468ff7b1c252322e8d47e848db0231e2254316",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc77f786d486703dea35efbf2468ff7b1c252322e8d47e848db0231e2254316a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "62c9599489320f980e4a8620f3a065ddaa56d40a95262513f199f97f5c71c94f",
+        "lastblockhash" : "0x2ae51b3340fc9db732d9af0a82d326fa53047129b7b4beeb0c09677c23735eb2",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6626020527f0186a0f2600b5500000000000000000000000000000000000000000000000000604052606060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
                     "0x0a" : "0x568a95f77b047bece6aa68843d2019332c46a585",
                     "0x0b" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5f27e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "568a95f77b047bece6aa68843d2019332c46a585" : {
+            "0x568a95f77b047bece6aa68843d2019332c46a585" : {
                 "balance" : "0x01",
                 "code" : "0x600160005533601455",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbf0d82",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6626020527f0186a0f2600b5500000000000000000000000000000000000000000000000000604052606060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -262,36 +272,41 @@
         }
     },
     "callcodeDynamicCode_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeDynamicCode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x028c35",
-                    "hash" : "b10ccb48530460cc432af5018a2aa09a29db4386c840744e342c663af962926d",
-                    "mixHash" : "fa8e2aea39da04dbff9fa0fa1d4709773a6aef87359c0dc64748f61ccc3904dd",
-                    "nonce" : "97117352e98f9b1e",
+                    "hash" : "0x9b1523080256cc0ccdb71e88489f3a94fc01c6084b6a08251702c0d10fc0c48d",
+                    "mixHash" : "0xdea45d38b27dcf69c4cecb9e103bd078a6611f3b5a3befd351657668eaab7007",
+                    "nonce" : "0x14ca41d5f3c8ed40",
                     "number" : "0x01",
-                    "parentHash" : "b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
-                    "receiptTrie" : "7630940fd6dcbb4b665c966bb805b8bd2727eae0f363343114be5984a0a316bb",
-                    "stateRoot" : "b2130a284e009216b1971be811447e4c9a9682c973cf3c9ec322a198053cc1fd",
+                    "parentHash" : "0xb81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
+                    "receiptTrie" : "0x7630940fd6dcbb4b665c966bb805b8bd2727eae0f363343114be5984a0a316bb",
+                    "stateRoot" : "0xb2130a284e009216b1971be811447e4c9a9682c973cf3c9ec322a198053cc1fd",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b2130a284e009216b1971be811447e4c9a9682c973cf3c9ec322a198053cc1fda074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07630940fd6dcbb4b665c966bb805b8bd2727eae0f363343114be5984a0a316bbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028c358203e880a0fa8e2aea39da04dbff9fa0fa1d4709773a6aef87359c0dc64748f61ccc3904dd8897117352e98f9b1ef862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b2130a284e009216b1971be811447e4c9a9682c973cf3c9ec322a198053cc1fda074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07630940fd6dcbb4b665c966bb805b8bd2727eae0f363343114be5984a0a316bbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028c358203e880a0dea45d38b27dcf69c4cecb9e103bd078a6611f3b5a3befd351657668eaab70078814ca41d5f3c8ed40f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -301,44 +316,44 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1cc77f786d486703dea35efbf2468ff7b1c252322e8d47e848db0231e2254316",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1cc77f786d486703dea35efbf2468ff7b1c252322e8d47e848db0231e2254316",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc77f786d486703dea35efbf2468ff7b1c252322e8d47e848db0231e2254316a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b10ccb48530460cc432af5018a2aa09a29db4386c840744e342c663af962926d",
+        "lastblockhash" : "0x9b1523080256cc0ccdb71e88489f3a94fc01c6084b6a08251702c0d10fc0c48d",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6626020527f0186a0f2600b5500000000000000000000000000000000000000000000000000604052606060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x01",
@@ -347,21 +362,21 @@
                     "0x14" : "0x13136008b64ff592819b2fa6d43f2835c452020e"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f68c35",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbe73cb",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
+            "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
                 "balance" : "0x01",
                 "code" : "0x600160005533601455",
                 "nonce" : "0x00",
@@ -370,23 +385,23 @@
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6626020527f0186a0f2600b5500000000000000000000000000000000000000000000000000604052606060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -394,36 +409,41 @@
         }
     },
     "callcodeDynamicCode_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeDynamicCode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x028c35",
-                    "hash" : "3df0a6f5ffdf2a9c23e18bdea8f83d2158114d17a4a08f29e8eeee8aec8d5c00",
-                    "mixHash" : "0f2683d1f7789caf119c3163179e3ef250fdc22d31ace86105e5d434c8584bd8",
-                    "nonce" : "e4ec184939c91552",
+                    "hash" : "0x46d413466c2b1276d03770533da873ace2410e90bc0384303ff401a033a73e19",
+                    "mixHash" : "0x82525414b5cdd52c824fc281e0a55d4613ad3d2d1b4def552f47e60a6766b74a",
+                    "nonce" : "0xcc3460ab41920efd",
                     "number" : "0x01",
-                    "parentHash" : "b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
-                    "receiptTrie" : "7630940fd6dcbb4b665c966bb805b8bd2727eae0f363343114be5984a0a316bb",
-                    "stateRoot" : "b2130a284e009216b1971be811447e4c9a9682c973cf3c9ec322a198053cc1fd",
+                    "parentHash" : "0xb81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
+                    "receiptTrie" : "0x7630940fd6dcbb4b665c966bb805b8bd2727eae0f363343114be5984a0a316bb",
+                    "stateRoot" : "0xb2130a284e009216b1971be811447e4c9a9682c973cf3c9ec322a198053cc1fd",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b2130a284e009216b1971be811447e4c9a9682c973cf3c9ec322a198053cc1fda074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07630940fd6dcbb4b665c966bb805b8bd2727eae0f363343114be5984a0a316bbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028c358203e880a00f2683d1f7789caf119c3163179e3ef250fdc22d31ace86105e5d434c8584bd888e4ec184939c91552f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b2130a284e009216b1971be811447e4c9a9682c973cf3c9ec322a198053cc1fda074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07630940fd6dcbb4b665c966bb805b8bd2727eae0f363343114be5984a0a316bbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028c358203e880a082525414b5cdd52c824fc281e0a55d4613ad3d2d1b4def552f47e60a6766b74a88cc3460ab41920efdf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -433,44 +453,44 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1cc77f786d486703dea35efbf2468ff7b1c252322e8d47e848db0231e2254316",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1cc77f786d486703dea35efbf2468ff7b1c252322e8d47e848db0231e2254316",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc77f786d486703dea35efbf2468ff7b1c252322e8d47e848db0231e2254316a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3df0a6f5ffdf2a9c23e18bdea8f83d2158114d17a4a08f29e8eeee8aec8d5c00",
+        "lastblockhash" : "0x46d413466c2b1276d03770533da873ace2410e90bc0384303ff401a033a73e19",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6626020527f0186a0f2600b5500000000000000000000000000000000000000000000000000604052606060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x01",
@@ -479,21 +499,21 @@
                     "0x14" : "0x13136008b64ff592819b2fa6d43f2835c452020e"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f68c35",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbe73cb",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
+            "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
                 "balance" : "0x01",
                 "code" : "0x600160005533601455",
                 "nonce" : "0x00",
@@ -502,23 +522,165 @@
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeDynamicCode_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x01f27e",
+                    "hash" : "0x38c493ab38656fdef7c2449bed548a11e0c9c9e21e0d6209806215aafb60aaeb",
+                    "mixHash" : "0x065f9b7c312a5c1e2ce0059d474424a8e4095114208e706ad283aa3efa14db74",
+                    "nonce" : "0xd55db8ef3a06f8a9",
+                    "number" : "0x01",
+                    "parentHash" : "0xb81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
+                    "receiptTrie" : "0x558bb60fd8611e8bbdad9f5c7a1412cf3ee0dad8249599dc78b5d621deebb38b",
+                    "stateRoot" : "0xb6fa80fa32b3624877ce53258cbd720dd2c84b7b090e4087c28b0cc2d90fb490",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6fa80fa32b3624877ce53258cbd720dd2c84b7b090e4087c28b0cc2d90fb490a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0558bb60fd8611e8bbdad9f5c7a1412cf3ee0dad8249599dc78b5d621deebb38bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27e8203e880a0065f9b7c312a5c1e2ce0059d474424a8e4095114208e706ad283aa3efa14db7488d55db8ef3a06f8a9f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "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" : "0x38c493ab38656fdef7c2449bed548a11e0c9c9e21e0d6209806215aafb60aaeb",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "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" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeEmptycontract.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeEmptycontract_d0g0v0.json
index 2ecc75f61..5ac76cda8 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeEmptycontract.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeEmptycontract_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodeEmptycontract_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeEmptycontract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xbd2e",
-                    "hash" : "e4d54bffa16eb116cd51b3411300e1480a65174edd80c07be123a9a859b92823",
-                    "mixHash" : "78a911be28b310a2856a50ed6778f3998bd3da84bc87ae857ab461a2bd4c8a61",
-                    "nonce" : "dd6ec5a794894eb8",
+                    "hash" : "0xc268100e3becc9ea07612d353adbaf83cda7c64010c158559ef89168cdb101b3",
+                    "mixHash" : "0x3352cc5a612a6273ffc0780e280b77388c65e3fef8e61e58d766c687a73d652a",
+                    "nonce" : "0x7115a34e9162e37f",
                     "number" : "0x01",
-                    "parentHash" : "f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
-                    "receiptTrie" : "d0ba0fbb176416fe62e237acdd9c989a544aac0e18629e370ab70c75a21aee25",
-                    "stateRoot" : "53e4bd0868f627961461bf3626fdcaa841589f2a8baab83cc8e54f00bbfc0942",
+                    "parentHash" : "0xf4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
+                    "receiptTrie" : "0xd0ba0fbb176416fe62e237acdd9c989a544aac0e18629e370ab70c75a21aee25",
+                    "stateRoot" : "0x53e4bd0868f627961461bf3626fdcaa841589f2a8baab83cc8e54f00bbfc0942",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa053e4bd0868f627961461bf3626fdcaa841589f2a8baab83cc8e54f00bbfc0942a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0d0ba0fbb176416fe62e237acdd9c989a544aac0e18629e370ab70c75a21aee25b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082bd2e8203e880a078a911be28b310a2856a50ed6778f3998bd3da84bc87ae857ab461a2bd4c8a6188dd6ec5a794894eb8f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a0f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa053e4bd0868f627961461bf3626fdcaa841589f2a8baab83cc8e54f00bbfc0942a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0d0ba0fbb176416fe62e237acdd9c989a544aac0e18629e370ab70c75a21aee25b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082bd2e8203e880a03352cc5a612a6273ffc0780e280b77388c65e3fef8e61e58d766c687a73d652a887115a34e9162e37ff862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x019a54",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x9b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5",
                         "s" : "0x14381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f93366e8c2941504a26d10518cea622642b9284c975a3a0ac19545d9ddf725e6",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf93366e8c2941504a26d10518cea622642b9284c975a3a0ac19545d9ddf725e6",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f93366e8c2941504a26d10518cea622642b9284c975a3a0ac19545d9ddf725e6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e4d54bffa16eb116cd51b3411300e1480a65174edd80c07be123a9a859b92823",
+        "lastblockhash" : "0xc268100e3becc9ea07612d353adbaf83cda7c64010c158559ef89168cdb101b3",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x60406000604060006103e873945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
                 "nonce" : "0x00",
@@ -68,32 +73,32 @@
                     "0x00" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4bd2e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0e8512",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x60406000604060006103e873945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -101,36 +106,41 @@
         }
     },
     "callcodeEmptycontract_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeEmptycontract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xbd2e",
-                    "hash" : "7afba032193790be1b1ea0d06274f7d2044f2f7374a79f3c955f4a841242c6a2",
-                    "mixHash" : "cbabefabfbb9a4c4ad76b41c2da43ada4605fb639370991df721bbd01da01348",
-                    "nonce" : "9298bc78aa5adce0",
+                    "hash" : "0x180881212a9a3123b511415af0368fee8bdcddd91d95a9b8f07b4bcfa67aa633",
+                    "mixHash" : "0xadaa6ba3037f336d2b177bb3c7eefcf224721b1ed033f32cd88da57a9428fe79",
+                    "nonce" : "0xfec83f5bce725708",
                     "number" : "0x01",
-                    "parentHash" : "f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
-                    "receiptTrie" : "d0ba0fbb176416fe62e237acdd9c989a544aac0e18629e370ab70c75a21aee25",
-                    "stateRoot" : "53e4bd0868f627961461bf3626fdcaa841589f2a8baab83cc8e54f00bbfc0942",
+                    "parentHash" : "0xf4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
+                    "receiptTrie" : "0xd0ba0fbb176416fe62e237acdd9c989a544aac0e18629e370ab70c75a21aee25",
+                    "stateRoot" : "0x53e4bd0868f627961461bf3626fdcaa841589f2a8baab83cc8e54f00bbfc0942",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa053e4bd0868f627961461bf3626fdcaa841589f2a8baab83cc8e54f00bbfc0942a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0d0ba0fbb176416fe62e237acdd9c989a544aac0e18629e370ab70c75a21aee25b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082bd2e8203e880a0cbabefabfbb9a4c4ad76b41c2da43ada4605fb639370991df721bbd01da01348889298bc78aa5adce0f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a0f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa053e4bd0868f627961461bf3626fdcaa841589f2a8baab83cc8e54f00bbfc0942a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0d0ba0fbb176416fe62e237acdd9c989a544aac0e18629e370ab70c75a21aee25b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082bd2e8203e880a0adaa6ba3037f336d2b177bb3c7eefcf224721b1ed033f32cd88da57a9428fe7988fec83f5bce725708f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x019a54",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x9b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5",
                         "s" : "0x14381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -140,28 +150,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f93366e8c2941504a26d10518cea622642b9284c975a3a0ac19545d9ddf725e6",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf93366e8c2941504a26d10518cea622642b9284c975a3a0ac19545d9ddf725e6",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f93366e8c2941504a26d10518cea622642b9284c975a3a0ac19545d9ddf725e6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7afba032193790be1b1ea0d06274f7d2044f2f7374a79f3c955f4a841242c6a2",
+        "lastblockhash" : "0x180881212a9a3123b511415af0368fee8bdcddd91d95a9b8f07b4bcfa67aa633",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x60406000604060006103e873945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
                 "nonce" : "0x00",
@@ -169,32 +179,32 @@
                     "0x00" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4bd2e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0e8512",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x60406000604060006103e873945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -202,36 +212,41 @@
         }
     },
     "callcodeEmptycontract_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeEmptycontract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xba9a",
-                    "hash" : "b953601ae24a5bed0e0c6e8d1359c8187b0c893372c14f70c3d1127ebb08d62b",
-                    "mixHash" : "0047c815af9c8e3c5208f1ceb24dacdfacfc7ffb90eeb5b250875044138fee8c",
-                    "nonce" : "fae50c8c04be9d90",
+                    "hash" : "0x620aac2a8f0d0873f1dffe656e996fe99e03732ab0934a3fb19e1675896dc9d7",
+                    "mixHash" : "0xe4a4fd2937bc6c4b54ba7be7fae147a16a8b73fc7e50a07f146b544c35587b08",
+                    "nonce" : "0x28711012a6ba8509",
                     "number" : "0x01",
-                    "parentHash" : "f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
-                    "receiptTrie" : "6f1d530bdcf0d33c293671c10fab49db556edfc39aaa30dbf40ba482501c3303",
-                    "stateRoot" : "7f56584264200bdbb767599f69ff15aa247084977a26158506d5d0f7ff0fdaa0",
+                    "parentHash" : "0xf4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
+                    "receiptTrie" : "0x6f1d530bdcf0d33c293671c10fab49db556edfc39aaa30dbf40ba482501c3303",
+                    "stateRoot" : "0x7f56584264200bdbb767599f69ff15aa247084977a26158506d5d0f7ff0fdaa0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f56584264200bdbb767599f69ff15aa247084977a26158506d5d0f7ff0fdaa0a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba06f1d530bdcf0d33c293671c10fab49db556edfc39aaa30dbf40ba482501c3303b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082ba9a8203e880a00047c815af9c8e3c5208f1ceb24dacdfacfc7ffb90eeb5b250875044138fee8c88fae50c8c04be9d90f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a0f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f56584264200bdbb767599f69ff15aa247084977a26158506d5d0f7ff0fdaa0a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba06f1d530bdcf0d33c293671c10fab49db556edfc39aaa30dbf40ba482501c3303b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082ba9a8203e880a0e4a4fd2937bc6c4b54ba7be7fae147a16a8b73fc7e50a07f146b544c35587b088828711012a6ba8509f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x019a54",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x9b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5",
                         "s" : "0x14381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -241,28 +256,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f93366e8c2941504a26d10518cea622642b9284c975a3a0ac19545d9ddf725e6",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf93366e8c2941504a26d10518cea622642b9284c975a3a0ac19545d9ddf725e6",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f93366e8c2941504a26d10518cea622642b9284c975a3a0ac19545d9ddf725e6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b953601ae24a5bed0e0c6e8d1359c8187b0c893372c14f70c3d1127ebb08d62b",
+        "lastblockhash" : "0x620aac2a8f0d0873f1dffe656e996fe99e03732ab0934a3fb19e1675896dc9d7",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x60406000604060006103e873945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
                 "nonce" : "0x00",
@@ -270,32 +285,32 @@
                     "0x00" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4ba9a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0e87a6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x60406000604060006103e873945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -303,36 +318,41 @@
         }
     },
     "callcodeEmptycontract_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeEmptycontract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xba9a",
-                    "hash" : "097ca316f38669e2192f3638caac4db7b32c291c966206d2d5bdadf2ab719481",
-                    "mixHash" : "8106b10be99d96b61b2523385420a431036e7b2ec1561b3bce932442abc316e6",
-                    "nonce" : "f4e6bfdc1ac5c822",
+                    "hash" : "0xdc4f6d88e9ea5c14c31f578cac3c08bc610374d596071287944cf9675f0d85b6",
+                    "mixHash" : "0x7046b23c3e9516dc41184c6ee55835deac63da4d02aff0b71e32d5d7b4692bf8",
+                    "nonce" : "0xffdf32a1f1e12dde",
                     "number" : "0x01",
-                    "parentHash" : "f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
-                    "receiptTrie" : "6f1d530bdcf0d33c293671c10fab49db556edfc39aaa30dbf40ba482501c3303",
-                    "stateRoot" : "7f56584264200bdbb767599f69ff15aa247084977a26158506d5d0f7ff0fdaa0",
+                    "parentHash" : "0xf4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
+                    "receiptTrie" : "0x6f1d530bdcf0d33c293671c10fab49db556edfc39aaa30dbf40ba482501c3303",
+                    "stateRoot" : "0x7f56584264200bdbb767599f69ff15aa247084977a26158506d5d0f7ff0fdaa0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f56584264200bdbb767599f69ff15aa247084977a26158506d5d0f7ff0fdaa0a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba06f1d530bdcf0d33c293671c10fab49db556edfc39aaa30dbf40ba482501c3303b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082ba9a8203e880a08106b10be99d96b61b2523385420a431036e7b2ec1561b3bce932442abc316e688f4e6bfdc1ac5c822f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a0f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f56584264200bdbb767599f69ff15aa247084977a26158506d5d0f7ff0fdaa0a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba06f1d530bdcf0d33c293671c10fab49db556edfc39aaa30dbf40ba482501c3303b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082ba9a8203e880a07046b23c3e9516dc41184c6ee55835deac63da4d02aff0b71e32d5d7b4692bf888ffdf32a1f1e12ddef862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x019a54",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x9b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5",
                         "s" : "0x14381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -342,28 +362,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f93366e8c2941504a26d10518cea622642b9284c975a3a0ac19545d9ddf725e6",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf93366e8c2941504a26d10518cea622642b9284c975a3a0ac19545d9ddf725e6",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f93366e8c2941504a26d10518cea622642b9284c975a3a0ac19545d9ddf725e6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "097ca316f38669e2192f3638caac4db7b32c291c966206d2d5bdadf2ab719481",
+        "lastblockhash" : "0xdc4f6d88e9ea5c14c31f578cac3c08bc610374d596071287944cf9675f0d85b6",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x60406000604060006103e873945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
                 "nonce" : "0x00",
@@ -371,32 +391,145 @@
                     "0x00" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4ba9a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0e87a6",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x03e8",
+                "code" : "0x60406000604060006103e873945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeEmptycontract_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeEmptycontract_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xbd2e",
+                    "hash" : "0x392325b8d94fc75fa10731e819a74dc8a8c5df9d7142fea8ecf8a2f4532dd7e1",
+                    "mixHash" : "0x6ea5db3def75c96cd72fa09ddfd0a7e454a9f3cc0e36575c8f139738552fe6c3",
+                    "nonce" : "0x8da73581d97e53fe",
+                    "number" : "0x01",
+                    "parentHash" : "0xf4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
+                    "receiptTrie" : "0x5514828a83b891aaebed966927472b7ea110fc1f42c0b834b71fced9b76a9e97",
+                    "stateRoot" : "0x6a29dfb5a6abfc4bb32fc91fd3aba3f8e3840a7f8881094dc2a4de82ce98a5d1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a0f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a29dfb5a6abfc4bb32fc91fd3aba3f8e3840a7f8881094dc2a4de82ce98a5d1a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba05514828a83b891aaebed966927472b7ea110fc1f42c0b834b71fced9b76a9e97b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082bd2e8203e880a06ea5db3def75c96cd72fa09ddfd0a7e454a9f3cc0e36575c8f139738552fe6c3888da73581d97e53fef862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "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" : "0x392325b8d94fc75fa10731e819a74dc8a8c5df9d7142fea8ecf8a2f4532dd7e1",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x60406000604060006103e873945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract_d0g0v0.json
index 0b2479d39..6a832cea5 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodeInInitcodeToEmptyContract_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToEmptyContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x012023",
-                    "hash" : "bd9c38db7dc1a1aa4c86ae7409c24d13a68b1ce75fbec492aa58645db34dc612",
-                    "mixHash" : "70e6f780a29440d752764010f05deef4bb25a49fc0223440e3530b3dfb20b39e",
-                    "nonce" : "526d939d57a5f197",
+                    "hash" : "0x93b5cec38cca0fc38bac120a7f482fa58ab2e41f78b27b8922075e2279b345ed",
+                    "mixHash" : "0xe3a6501e86df4c6d93b767f759453954a99d75c92561835cb93d257d4c4b8986",
+                    "nonce" : "0x24239bbcf20f955e",
                     "number" : "0x01",
-                    "parentHash" : "a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
-                    "receiptTrie" : "56de346fa5ae6fd12063335ed1333bf8ef3ae0a53700f0b4b332ac201cfb2369",
-                    "stateRoot" : "e4384da120539ce859e3517b824219a0e4ad3a54af01c7ca1042f9083ae469a5",
+                    "parentHash" : "0xa8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
+                    "receiptTrie" : "0x56de346fa5ae6fd12063335ed1333bf8ef3ae0a53700f0b4b332ac201cfb2369",
+                    "stateRoot" : "0xe4384da120539ce859e3517b824219a0e4ad3a54af01c7ca1042f9083ae469a5",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e4384da120539ce859e3517b824219a0e4ad3a54af01c7ca1042f9083ae469a5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a056de346fa5ae6fd12063335ed1333bf8ef3ae0a53700f0b4b332ac201cfb2369b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120238203e880a070e6f780a29440d752764010f05deef4bb25a49fc0223440e3530b3dfb20b39e88526d939d57a5f197f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e4384da120539ce859e3517b824219a0e4ad3a54af01c7ca1042f9083ae469a5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a056de346fa5ae6fd12063335ed1333bf8ef3ae0a53700f0b4b332ac201cfb2369b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120238203e880a0e3a6501e86df4c6d93b767f759453954a99d75c92561835cb93d257d4c4b89868824239bbcf20f955ef862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,68 +44,68 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "41d9ee821f00949f6bca6748da79dd268332b5352305eff1721c91de338ef09c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x41d9ee821f00949f6bca6748da79dd268332b5352305eff1721c91de338ef09c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d9ee821f00949f6bca6748da79dd268332b5352305eff1721c91de338ef09ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "bd9c38db7dc1a1aa4c86ae7409c24d13a68b1ce75fbec492aa58645db34dc612",
+        "lastblockhash" : "0x93b5cec38cca0fc38bac120a7f482fa58ab2e41f78b27b8922075e2279b345ed",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52023",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbfdfdd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -108,36 +113,41 @@
         }
     },
     "callcodeInInitcodeToEmptyContract_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToEmptyContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x012023",
-                    "hash" : "0632bfe1d1f95d74733892d46243f601110b7af56f6a7fde2e9d27688f8d6a37",
-                    "mixHash" : "e48a617cceabfca8ad1c0e4689117616637ee75302af10c673c987b4667becc3",
-                    "nonce" : "1109ebe4c3dc4281",
+                    "hash" : "0xa19e5c18e893c53ebbcdcaf8a3f6261574edaab7d5ff077e2178c6bea799207b",
+                    "mixHash" : "0x9c1dc73a7a7e3a4654a77c905771bdebba85d4e06feb82bc51d4cb6a05d6e966",
+                    "nonce" : "0x8e0f9dccfebd7fbc",
                     "number" : "0x01",
-                    "parentHash" : "a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
-                    "receiptTrie" : "0745c1976e90d9cee0138a037b6fb3d90a286a453710f54941be29371c47e8d9",
-                    "stateRoot" : "896ffc485fc3042fc267f0c20f6f4f8f4ccc91fe847491025fac6d5add08ab73",
+                    "parentHash" : "0xa8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
+                    "receiptTrie" : "0x0745c1976e90d9cee0138a037b6fb3d90a286a453710f54941be29371c47e8d9",
+                    "stateRoot" : "0x896ffc485fc3042fc267f0c20f6f4f8f4ccc91fe847491025fac6d5add08ab73",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0896ffc485fc3042fc267f0c20f6f4f8f4ccc91fe847491025fac6d5add08ab73a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00745c1976e90d9cee0138a037b6fb3d90a286a453710f54941be29371c47e8d9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120238203e880a0e48a617cceabfca8ad1c0e4689117616637ee75302af10c673c987b4667becc3881109ebe4c3dc4281f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0896ffc485fc3042fc267f0c20f6f4f8f4ccc91fe847491025fac6d5add08ab73a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00745c1976e90d9cee0138a037b6fb3d90a286a453710f54941be29371c47e8d9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120238203e880a09c1dc73a7a7e3a4654a77c905771bdebba85d4e06feb82bc51d4cb6a05d6e966888e0f9dccfebd7fbcf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -147,68 +157,68 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "41d9ee821f00949f6bca6748da79dd268332b5352305eff1721c91de338ef09c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x41d9ee821f00949f6bca6748da79dd268332b5352305eff1721c91de338ef09c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d9ee821f00949f6bca6748da79dd268332b5352305eff1721c91de338ef09ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0632bfe1d1f95d74733892d46243f601110b7af56f6a7fde2e9d27688f8d6a37",
+        "lastblockhash" : "0xa19e5c18e893c53ebbcdcaf8a3f6261574edaab7d5ff077e2178c6bea799207b",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52023",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbfdfdd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -216,36 +226,41 @@
         }
     },
     "callcodeInInitcodeToEmptyContract_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToEmptyContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x011d8f",
-                    "hash" : "8a068cf3d20c7a94fa2da65293a578592b2a74c8854bcd17401ed5da3a55c25f",
-                    "mixHash" : "29880fe490e39f05edbadbdab60542b14d6dae2ccc2f4d20daf9368ef11c2c53",
-                    "nonce" : "68affe11015c46d4",
+                    "hash" : "0x1e54f49593b8b1b4b5c4ad362638a5e31622d457c585236238ec30937781e093",
+                    "mixHash" : "0xe2a44568c155d678db072b8392c32bd9958620ff97a8d18fd32b5de88584ecec",
+                    "nonce" : "0x50e3e529434401ef",
                     "number" : "0x01",
-                    "parentHash" : "a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
-                    "receiptTrie" : "d8b47e710670d0ea297c042530863470be5ccc8a6770251e5c95239cd6c17335",
-                    "stateRoot" : "d78c731bb211e3e8751ca07f98948b29543fa7f814c11c161174c3a1279ce486",
+                    "parentHash" : "0xa8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
+                    "receiptTrie" : "0xd8b47e710670d0ea297c042530863470be5ccc8a6770251e5c95239cd6c17335",
+                    "stateRoot" : "0xd78c731bb211e3e8751ca07f98948b29543fa7f814c11c161174c3a1279ce486",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d78c731bb211e3e8751ca07f98948b29543fa7f814c11c161174c3a1279ce486a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0d8b47e710670d0ea297c042530863470be5ccc8a6770251e5c95239cd6c17335b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d8f8203e880a029880fe490e39f05edbadbdab60542b14d6dae2ccc2f4d20daf9368ef11c2c538868affe11015c46d4f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d78c731bb211e3e8751ca07f98948b29543fa7f814c11c161174c3a1279ce486a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0d8b47e710670d0ea297c042530863470be5ccc8a6770251e5c95239cd6c17335b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d8f8203e880a0e2a44568c155d678db072b8392c32bd9958620ff97a8d18fd32b5de88584ecec8850e3e529434401eff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -255,68 +270,68 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "41d9ee821f00949f6bca6748da79dd268332b5352305eff1721c91de338ef09c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x41d9ee821f00949f6bca6748da79dd268332b5352305eff1721c91de338ef09c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d9ee821f00949f6bca6748da79dd268332b5352305eff1721c91de338ef09ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8a068cf3d20c7a94fa2da65293a578592b2a74c8854bcd17401ed5da3a55c25f",
+        "lastblockhash" : "0x1e54f49593b8b1b4b5c4ad362638a5e31622d457c585236238ec30937781e093",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51d8f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbfe271",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -324,36 +339,41 @@
         }
     },
     "callcodeInInitcodeToEmptyContract_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToEmptyContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x011d8f",
-                    "hash" : "bb9bc982eefd955e173fa0e44111a2c99f36538e163797077cd357023758270a",
-                    "mixHash" : "9eb32758aa89642945f26cb930eec56a6f646172a76ab9b4e4535ee31373e7a1",
-                    "nonce" : "2af8b23331858c54",
+                    "hash" : "0x3c890350ba3ecd47290111726d65f435568cfbf5dd4a40157f8acde473870153",
+                    "mixHash" : "0xdd65b5992df6dd35d6f2ca81e549471d0d5ac0afe5e5037b197de6ce5f0e7c60",
+                    "nonce" : "0xb8dec57096433cdf",
                     "number" : "0x01",
-                    "parentHash" : "a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
-                    "receiptTrie" : "d8b47e710670d0ea297c042530863470be5ccc8a6770251e5c95239cd6c17335",
-                    "stateRoot" : "d78c731bb211e3e8751ca07f98948b29543fa7f814c11c161174c3a1279ce486",
+                    "parentHash" : "0xa8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
+                    "receiptTrie" : "0xd8b47e710670d0ea297c042530863470be5ccc8a6770251e5c95239cd6c17335",
+                    "stateRoot" : "0xd78c731bb211e3e8751ca07f98948b29543fa7f814c11c161174c3a1279ce486",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d78c731bb211e3e8751ca07f98948b29543fa7f814c11c161174c3a1279ce486a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0d8b47e710670d0ea297c042530863470be5ccc8a6770251e5c95239cd6c17335b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d8f8203e880a09eb32758aa89642945f26cb930eec56a6f646172a76ab9b4e4535ee31373e7a1882af8b23331858c54f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d78c731bb211e3e8751ca07f98948b29543fa7f814c11c161174c3a1279ce486a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0d8b47e710670d0ea297c042530863470be5ccc8a6770251e5c95239cd6c17335b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d8f8203e880a0dd65b5992df6dd35d6f2ca81e549471d0d5ac0afe5e5037b197de6ce5f0e7c6088b8dec57096433cdff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -363,68 +383,188 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "41d9ee821f00949f6bca6748da79dd268332b5352305eff1721c91de338ef09c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x41d9ee821f00949f6bca6748da79dd268332b5352305eff1721c91de338ef09c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d9ee821f00949f6bca6748da79dd268332b5352305eff1721c91de338ef09ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "bb9bc982eefd955e173fa0e44111a2c99f36538e163797077cd357023758270a",
+        "lastblockhash" : "0x3c890350ba3ecd47290111726d65f435568cfbf5dd4a40157f8acde473870153",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51d8f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbfe271",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x2710",
+                "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc10000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeInInitcodeToEmptyContract_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToEmptyContract_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x012023",
+                    "hash" : "0x8d28d4268e8ad1e664621fe5f9b5568f5bc8f07337d9e794ca47303f164befb7",
+                    "mixHash" : "0x92becdeab9e62d75f9e16b799f7b80cc2a1ce4eb705bf553d67db055618d5ab6",
+                    "nonce" : "0xca49a7c0a353af7e",
+                    "number" : "0x01",
+                    "parentHash" : "0xa8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
+                    "receiptTrie" : "0x48b288c78f5bed9a4a7b103c0b6cac3f9d351dc02afa28bb5eb4521b0cb6db42",
+                    "stateRoot" : "0xd1aeb274e80d20b571e991f60e3d80e63d007c5a70032fdf83dfdc3413192c66",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d1aeb274e80d20b571e991f60e3d80e63d007c5a70032fdf83dfdc3413192c66a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a048b288c78f5bed9a4a7b103c0b6cac3f9d351dc02afa28bb5eb4521b0cb6db42b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120238203e880a092becdeab9e62d75f9e16b799f7b80cc2a1ce4eb705bf553d67db055618d5ab688ca49a7c0a353af7ef862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "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" : "0x8d28d4268e8ad1e664621fe5f9b5568f5bc8f07337d9e794ca47303f164befb7",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0.json
index 686250156..85b15e55e 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xffb7",
-                    "hash" : "0112fa8586b7459439e7f4f461d62af2d5d0a253e18e37b4348e9bdc365e66c0",
-                    "mixHash" : "39c98fc5468c1d0ca47fc79680665df56cc676a9d8c1ad143e862bba98834efd",
-                    "nonce" : "02b25b2ebf2d754c",
+                    "hash" : "0xf6657561c755cb527d51b3e279b3abdb81d6a5c86e597ea25513f869ace3d489",
+                    "mixHash" : "0xb99752cad4baaa5a48975a8b095ef98db173e93aff8f320502339841d1139337",
+                    "nonce" : "0x621311b3e79ad170",
                     "number" : "0x01",
-                    "parentHash" : "72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
-                    "receiptTrie" : "6ca84d40495dfb42ccaed73f28c678d656273f355baacceaafd6c40ea55fe220",
-                    "stateRoot" : "3c7a62bd45dc30d80b1553d1a558bfdb96c68bd9b0141a65badd266fb77ddb2f",
+                    "parentHash" : "0x72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
+                    "receiptTrie" : "0x6ca84d40495dfb42ccaed73f28c678d656273f355baacceaafd6c40ea55fe220",
+                    "stateRoot" : "0x3c7a62bd45dc30d80b1553d1a558bfdb96c68bd9b0141a65badd266fb77ddb2f",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a072a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c7a62bd45dc30d80b1553d1a558bfdb96c68bd9b0141a65badd266fb77ddb2fa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a06ca84d40495dfb42ccaed73f28c678d656273f355baacceaafd6c40ea55fe220b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082ffb78203e880a039c98fc5468c1d0ca47fc79680665df56cc676a9d8c1ad143e862bba98834efd8802b25b2ebf2d754cf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf9025ff901f7a072a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c7a62bd45dc30d80b1553d1a558bfdb96c68bd9b0141a65badd266fb77ddb2fa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a06ca84d40495dfb42ccaed73f28c678d656273f355baacceaafd6c40ea55fe220b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082ffb78203e880a0b99752cad4baaa5a48975a8b095ef98db173e93aff8f320502339841d113933788621311b3e79ad170f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,81 +44,81 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "040c4fb84b0dea181a27ac441122a4bf819bc6d8e758797c3a5b1361d3dad220",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x040c4fb84b0dea181a27ac441122a4bf819bc6d8e758797c3a5b1361d3dad220",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0040c4fb84b0dea181a27ac441122a4bf819bc6d8e758797c3a5b1361d3dad220a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0112fa8586b7459439e7f4f461d62af2d5d0a253e18e37b4348e9bdc365e66c0",
+        "lastblockhash" : "0xf6657561c755cb527d51b3e279b3abdb81d6a5c86e597ea25513f869ace3d489",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4ffb7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc00049",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -121,36 +126,41 @@
         }
     },
     "callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xffb7",
-                    "hash" : "40aa19614f57416e6400e469759a14fc67a928ef73d197bb409c01a41c9bdf7e",
-                    "mixHash" : "fc1b830c061bfa2c98b2770c5b52c5e534734b2329ecd4f3bfa78fa16a4fa2c9",
-                    "nonce" : "3b6f98698d3e943d",
+                    "hash" : "0x4c9604c46a03c8866c0e79bf7fc4afc0ba50c1ae19c415f0e722d4641562ab5e",
+                    "mixHash" : "0x01acb44e35cdde7ccab353f68afe5120085130c6c43f8408eeba3ffdbc320be4",
+                    "nonce" : "0x8beaea1a194fdcdd",
                     "number" : "0x01",
-                    "parentHash" : "72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
-                    "receiptTrie" : "5ec054dceda0108e7188e1966bb2adbac4ba41c7ffa27471229689caa563499b",
-                    "stateRoot" : "b81ad6358e612451ce81044e1d3f54d0ef1ced101052fc38dd5b763d6704a3a1",
+                    "parentHash" : "0x72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
+                    "receiptTrie" : "0x5ec054dceda0108e7188e1966bb2adbac4ba41c7ffa27471229689caa563499b",
+                    "stateRoot" : "0xb81ad6358e612451ce81044e1d3f54d0ef1ced101052fc38dd5b763d6704a3a1",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a072a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b81ad6358e612451ce81044e1d3f54d0ef1ced101052fc38dd5b763d6704a3a1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a05ec054dceda0108e7188e1966bb2adbac4ba41c7ffa27471229689caa563499bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082ffb78203e880a0fc1b830c061bfa2c98b2770c5b52c5e534734b2329ecd4f3bfa78fa16a4fa2c9883b6f98698d3e943df862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf9025ff901f7a072a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b81ad6358e612451ce81044e1d3f54d0ef1ced101052fc38dd5b763d6704a3a1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a05ec054dceda0108e7188e1966bb2adbac4ba41c7ffa27471229689caa563499bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082ffb78203e880a001acb44e35cdde7ccab353f68afe5120085130c6c43f8408eeba3ffdbc320be4888beaea1a194fdcddf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -160,81 +170,81 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "040c4fb84b0dea181a27ac441122a4bf819bc6d8e758797c3a5b1361d3dad220",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x040c4fb84b0dea181a27ac441122a4bf819bc6d8e758797c3a5b1361d3dad220",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0040c4fb84b0dea181a27ac441122a4bf819bc6d8e758797c3a5b1361d3dad220a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "40aa19614f57416e6400e469759a14fc67a928ef73d197bb409c01a41c9bdf7e",
+        "lastblockhash" : "0x4c9604c46a03c8866c0e79bf7fc4afc0ba50c1ae19c415f0e722d4641562ab5e",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4ffb7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc00049",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -242,36 +252,41 @@
         }
     },
     "callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xfd23",
-                    "hash" : "4e234eb114fa4a1551d4366a24f9b23128b7dfc910db805a210d67fff7b009c1",
-                    "mixHash" : "b6fc81aed1513d3f1a2ea98e279a2f28604404907dfa97db8fe25a4013e9363d",
-                    "nonce" : "f62b05c5a0ff30bf",
+                    "hash" : "0xd727f135f34e43e8f47401546bc4d7f39f09dbdc1fc23882e2261bce3347071b",
+                    "mixHash" : "0xb46dac4ea3a0a5c994d058be75fb7652947041fc1600d4d1f661bf5c9475fa2d",
+                    "nonce" : "0xa4003be091860b8e",
                     "number" : "0x01",
-                    "parentHash" : "72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
-                    "receiptTrie" : "780da83fe09e228d95a03bd299fc6f7c10f71b8b15c508b444a345a69a4efca4",
-                    "stateRoot" : "3621f0fee436564f2861a45c5f242f0c3d90aafd8cac445e9af4b4a30ed98ba3",
+                    "parentHash" : "0x72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
+                    "receiptTrie" : "0x780da83fe09e228d95a03bd299fc6f7c10f71b8b15c508b444a345a69a4efca4",
+                    "stateRoot" : "0x3621f0fee436564f2861a45c5f242f0c3d90aafd8cac445e9af4b4a30ed98ba3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a072a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03621f0fee436564f2861a45c5f242f0c3d90aafd8cac445e9af4b4a30ed98ba3a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0780da83fe09e228d95a03bd299fc6f7c10f71b8b15c508b444a345a69a4efca4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082fd238203e880a0b6fc81aed1513d3f1a2ea98e279a2f28604404907dfa97db8fe25a4013e9363d88f62b05c5a0ff30bff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf9025ff901f7a072a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03621f0fee436564f2861a45c5f242f0c3d90aafd8cac445e9af4b4a30ed98ba3a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0780da83fe09e228d95a03bd299fc6f7c10f71b8b15c508b444a345a69a4efca4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082fd238203e880a0b46dac4ea3a0a5c994d058be75fb7652947041fc1600d4d1f661bf5c9475fa2d88a4003be091860b8ef862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -281,81 +296,81 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "040c4fb84b0dea181a27ac441122a4bf819bc6d8e758797c3a5b1361d3dad220",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x040c4fb84b0dea181a27ac441122a4bf819bc6d8e758797c3a5b1361d3dad220",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0040c4fb84b0dea181a27ac441122a4bf819bc6d8e758797c3a5b1361d3dad220a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4e234eb114fa4a1551d4366a24f9b23128b7dfc910db805a210d67fff7b009c1",
+        "lastblockhash" : "0xd727f135f34e43e8f47401546bc4d7f39f09dbdc1fc23882e2261bce3347071b",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4fd23",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc002dd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -363,36 +378,41 @@
         }
     },
     "callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xfd23",
-                    "hash" : "cd9191991ee8ae12dda0a0072148ede493e8e451f5a5cf7ec559693eab1dd70f",
-                    "mixHash" : "c842fc14e404607cd706abf367cf1b9197bf6e65eb27ed2bf2e286d6dd161f35",
-                    "nonce" : "9dffd0b2a7829a7c",
+                    "hash" : "0x93086b63bcd0026726e321fa391e135ce8a34ffb9ba849a420f01f8b9349481f",
+                    "mixHash" : "0x03d11ba254d5510eab11fa0a5f0d8edef4e6223bc9030b7b8826fe2ecdcc10fd",
+                    "nonce" : "0xefd798826b1741c5",
                     "number" : "0x01",
-                    "parentHash" : "72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
-                    "receiptTrie" : "780da83fe09e228d95a03bd299fc6f7c10f71b8b15c508b444a345a69a4efca4",
-                    "stateRoot" : "3621f0fee436564f2861a45c5f242f0c3d90aafd8cac445e9af4b4a30ed98ba3",
+                    "parentHash" : "0x72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
+                    "receiptTrie" : "0x780da83fe09e228d95a03bd299fc6f7c10f71b8b15c508b444a345a69a4efca4",
+                    "stateRoot" : "0x3621f0fee436564f2861a45c5f242f0c3d90aafd8cac445e9af4b4a30ed98ba3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a072a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03621f0fee436564f2861a45c5f242f0c3d90aafd8cac445e9af4b4a30ed98ba3a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0780da83fe09e228d95a03bd299fc6f7c10f71b8b15c508b444a345a69a4efca4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082fd238203e880a0c842fc14e404607cd706abf367cf1b9197bf6e65eb27ed2bf2e286d6dd161f35889dffd0b2a7829a7cf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf9025ff901f7a072a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03621f0fee436564f2861a45c5f242f0c3d90aafd8cac445e9af4b4a30ed98ba3a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0780da83fe09e228d95a03bd299fc6f7c10f71b8b15c508b444a345a69a4efca4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082fd238203e880a003d11ba254d5510eab11fa0a5f0d8edef4e6223bc9030b7b8826fe2ecdcc10fd88efd798826b1741c5f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -402,81 +422,214 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "040c4fb84b0dea181a27ac441122a4bf819bc6d8e758797c3a5b1361d3dad220",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x040c4fb84b0dea181a27ac441122a4bf819bc6d8e758797c3a5b1361d3dad220",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0040c4fb84b0dea181a27ac441122a4bf819bc6d8e758797c3a5b1361d3dad220a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "cd9191991ee8ae12dda0a0072148ede493e8e451f5a5cf7ec559693eab1dd70f",
+        "lastblockhash" : "0x93086b63bcd0026726e321fa391e135ce8a34ffb9ba849a420f01f8b9349481f",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4fd23",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc002dd",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xffb7",
+                    "hash" : "0x11d9e98eef8698a5a677353248eb333756799aa3effa15a74b1674f63514efbc",
+                    "mixHash" : "0x19b2f6ce725de4ea917343d33a368967c5bf2c9c333265b3b8c3e0973252758c",
+                    "nonce" : "0x6626aaaa816cad4e",
+                    "number" : "0x01",
+                    "parentHash" : "0x72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
+                    "receiptTrie" : "0xbcc60625b4191bafc73d74ed615797f4f8f2d27f95f9a1e6d39719e245b5912d",
+                    "stateRoot" : "0xa3f584de09ca848138a7a7cd28bd91e89696c7bf5b706f45bd3a03569d0490a5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a072a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3f584de09ca848138a7a7cd28bd91e89696c7bf5b706f45bd3a03569d0490a5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0bcc60625b4191bafc73d74ed615797f4f8f2d27f95f9a1e6d39719e245b5912db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082ffb78203e880a019b2f6ce725de4ea917343d33a368967c5bf2c9c333265b3b8c3e0973252758c886626aaaa816cad4ef862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "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" : "0x11d9e98eef8698a5a677353248eb333756799aa3effa15a74b1674f63514efbc",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x270f",
+                "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ffb7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x00",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc00049",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0.json
index e9fc8c502..725174a7e 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x018875",
-                    "hash" : "b9e25274898ba16da16159eabed427c814cd776390303454dedf4eac810813bc",
-                    "mixHash" : "b6434cba11c340a5af68f364ff73c6678c6715c979a3e21f6fc4bbbe4fe605eb",
-                    "nonce" : "4fa1d77aae5a6956",
+                    "hash" : "0xf9e2347c591f2c35a756127b241e139c6189d0c5c2cac06ba2c8e70fc555af03",
+                    "mixHash" : "0xf185506092c10c5aef8537ce11cd0e4b83580c88de5cb3e22d4d4f372995a068",
+                    "nonce" : "0xa942c2f1c150e804",
                     "number" : "0x01",
-                    "parentHash" : "f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
-                    "receiptTrie" : "7d151e4dda50e27dac73052801058c8f2f4e863677bbfc155f8cd243a0fa24c4",
-                    "stateRoot" : "b6b093e75db3397817e1e56fc76e9aaa805f9b94307ce1e79c608a1127a61fff",
+                    "parentHash" : "0xf1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
+                    "receiptTrie" : "0x7d151e4dda50e27dac73052801058c8f2f4e863677bbfc155f8cd243a0fa24c4",
+                    "stateRoot" : "0xb6b093e75db3397817e1e56fc76e9aaa805f9b94307ce1e79c608a1127a61fff",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6b093e75db3397817e1e56fc76e9aaa805f9b94307ce1e79c608a1127a61fffa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07d151e4dda50e27dac73052801058c8f2f4e863677bbfc155f8cd243a0fa24c4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830188758203e880a0b6434cba11c340a5af68f364ff73c6678c6715c979a3e21f6fc4bbbe4fe605eb884fa1d77aae5a6956f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6b093e75db3397817e1e56fc76e9aaa805f9b94307ce1e79c608a1127a61fffa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07d151e4dda50e27dac73052801058c8f2f4e863677bbfc155f8cd243a0fa24c4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830188758203e880a0f185506092c10c5aef8537ce11cd0e4b83580c88de5cb3e22d4d4f372995a06888a942c2f1c150e804f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,83 +44,83 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8a0ffd5a31c20db0f7246a396d901f9e10fcb03b39277746c95c4c18eea4ff8d",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8a0ffd5a31c20db0f7246a396d901f9e10fcb03b39277746c95c4c18eea4ff8d",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a0ffd5a31c20db0f7246a396d901f9e10fcb03b39277746c95c4c18eea4ff8da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b9e25274898ba16da16159eabed427c814cd776390303454dedf4eac810813bc",
+        "lastblockhash" : "0xf9e2347c591f2c35a756127b241e139c6189d0c5c2cac06ba2c8e70fc555af03",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270b",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x05",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01",
                     "0x02" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f58875",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbf778b",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -123,36 +128,41 @@
         }
     },
     "callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x018875",
-                    "hash" : "b990487c98b17389c13ba8540d04f66130e439fa350727a5acaebae67a1c7f19",
-                    "mixHash" : "3caabdf6da76bd0337826e2949099e35e94250bb449f2147bf16adc67186b329",
-                    "nonce" : "1e123cb1d83ae385",
+                    "hash" : "0xaa1d97c1517a668d4875a738c28ae4a4f35d0b30c16f64f1acda9f85d7066a75",
+                    "mixHash" : "0x5fbca8fb9ba13c2a9592d1f7aaf121dcc789f6bb899f5f66373f37260d55bd33",
+                    "nonce" : "0x5edb57f4047e05cb",
                     "number" : "0x01",
-                    "parentHash" : "f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
-                    "receiptTrie" : "efb760972844a6f828af17d3b5da46e8b1543fbb8f8c1414eff1cdfcf4359078",
-                    "stateRoot" : "0b6b4816c2cde4dca95457e6991fc111374092dfb73767a91a6d438487245ea6",
+                    "parentHash" : "0xf1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
+                    "receiptTrie" : "0xefb760972844a6f828af17d3b5da46e8b1543fbb8f8c1414eff1cdfcf4359078",
+                    "stateRoot" : "0x0b6b4816c2cde4dca95457e6991fc111374092dfb73767a91a6d438487245ea6",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b6b4816c2cde4dca95457e6991fc111374092dfb73767a91a6d438487245ea6a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0efb760972844a6f828af17d3b5da46e8b1543fbb8f8c1414eff1cdfcf4359078b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830188758203e880a03caabdf6da76bd0337826e2949099e35e94250bb449f2147bf16adc67186b329881e123cb1d83ae385f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b6b4816c2cde4dca95457e6991fc111374092dfb73767a91a6d438487245ea6a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0efb760972844a6f828af17d3b5da46e8b1543fbb8f8c1414eff1cdfcf4359078b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830188758203e880a05fbca8fb9ba13c2a9592d1f7aaf121dcc789f6bb899f5f66373f37260d55bd33885edb57f4047e05cbf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -162,83 +172,83 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8a0ffd5a31c20db0f7246a396d901f9e10fcb03b39277746c95c4c18eea4ff8d",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8a0ffd5a31c20db0f7246a396d901f9e10fcb03b39277746c95c4c18eea4ff8d",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a0ffd5a31c20db0f7246a396d901f9e10fcb03b39277746c95c4c18eea4ff8da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b990487c98b17389c13ba8540d04f66130e439fa350727a5acaebae67a1c7f19",
+        "lastblockhash" : "0xaa1d97c1517a668d4875a738c28ae4a4f35d0b30c16f64f1acda9f85d7066a75",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270b",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x05",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x01",
                     "0x02" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f58875",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbf778b",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -246,36 +256,41 @@
         }
     },
     "callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0185e1",
-                    "hash" : "a86bda2070e13701383fe279f5ebfbcb9ec3a6c611ae40de81a52a36875b1315",
-                    "mixHash" : "9acbf9970f0eef6091f0c012bf323bd213d56e7dc2e0765947ac9147c367f0d4",
-                    "nonce" : "f79e12684dc6b443",
+                    "hash" : "0xf51d2a433885dfd86eb0eebcb5ee1aa7f6136201710861bc0e935038de85330f",
+                    "mixHash" : "0xdc3bdfefb19d2d39ece764b47fdd1de71fd1bff33735a079084bc916ea139096",
+                    "nonce" : "0xc9e68a2eb3e83c31",
                     "number" : "0x01",
-                    "parentHash" : "f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
-                    "receiptTrie" : "a23fb8a02d6a10e6df422b5f267c17c2ec953b3f66fe5e65bfc0fc4b40f22c63",
-                    "stateRoot" : "c0a7bba762c7162166ed41e77dafe2b10ea86df52b0e08cec35c4d8cc379fb7f",
+                    "parentHash" : "0xf1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
+                    "receiptTrie" : "0xa23fb8a02d6a10e6df422b5f267c17c2ec953b3f66fe5e65bfc0fc4b40f22c63",
+                    "stateRoot" : "0xc0a7bba762c7162166ed41e77dafe2b10ea86df52b0e08cec35c4d8cc379fb7f",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c0a7bba762c7162166ed41e77dafe2b10ea86df52b0e08cec35c4d8cc379fb7fa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0a23fb8a02d6a10e6df422b5f267c17c2ec953b3f66fe5e65bfc0fc4b40f22c63b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830185e18203e880a09acbf9970f0eef6091f0c012bf323bd213d56e7dc2e0765947ac9147c367f0d488f79e12684dc6b443f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c0a7bba762c7162166ed41e77dafe2b10ea86df52b0e08cec35c4d8cc379fb7fa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0a23fb8a02d6a10e6df422b5f267c17c2ec953b3f66fe5e65bfc0fc4b40f22c63b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830185e18203e880a0dc3bdfefb19d2d39ece764b47fdd1de71fd1bff33735a079084bc916ea13909688c9e68a2eb3e83c31f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -285,83 +300,83 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8a0ffd5a31c20db0f7246a396d901f9e10fcb03b39277746c95c4c18eea4ff8d",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8a0ffd5a31c20db0f7246a396d901f9e10fcb03b39277746c95c4c18eea4ff8d",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a0ffd5a31c20db0f7246a396d901f9e10fcb03b39277746c95c4c18eea4ff8da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a86bda2070e13701383fe279f5ebfbcb9ec3a6c611ae40de81a52a36875b1315",
+        "lastblockhash" : "0xf51d2a433885dfd86eb0eebcb5ee1aa7f6136201710861bc0e935038de85330f",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270b",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x05",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01",
                     "0x02" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f585e1",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbf7a1f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -369,36 +384,41 @@
         }
     },
     "callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0185e1",
-                    "hash" : "9526fbe473cdf755a0424cb7f04c247c60cca0f9f096706b9c15b81895eb7d56",
-                    "mixHash" : "6cc26f651f7ad91ad377c8bec07cb90cd719bf31a7e45813693ba63208c17502",
-                    "nonce" : "693546435b52fa4d",
+                    "hash" : "0x68f3644bc853bf48b64f2fcb2ce1d85985752805d01f1d5a18f769b1a61fb507",
+                    "mixHash" : "0x767cf52173d391ad28fb882b0037c5285611b1ee141ee7641f58c4b94ff34f04",
+                    "nonce" : "0x80749f8e8b11d021",
                     "number" : "0x01",
-                    "parentHash" : "f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
-                    "receiptTrie" : "a23fb8a02d6a10e6df422b5f267c17c2ec953b3f66fe5e65bfc0fc4b40f22c63",
-                    "stateRoot" : "c0a7bba762c7162166ed41e77dafe2b10ea86df52b0e08cec35c4d8cc379fb7f",
+                    "parentHash" : "0xf1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
+                    "receiptTrie" : "0xa23fb8a02d6a10e6df422b5f267c17c2ec953b3f66fe5e65bfc0fc4b40f22c63",
+                    "stateRoot" : "0xc0a7bba762c7162166ed41e77dafe2b10ea86df52b0e08cec35c4d8cc379fb7f",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c0a7bba762c7162166ed41e77dafe2b10ea86df52b0e08cec35c4d8cc379fb7fa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0a23fb8a02d6a10e6df422b5f267c17c2ec953b3f66fe5e65bfc0fc4b40f22c63b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830185e18203e880a06cc26f651f7ad91ad377c8bec07cb90cd719bf31a7e45813693ba63208c1750288693546435b52fa4df862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c0a7bba762c7162166ed41e77dafe2b10ea86df52b0e08cec35c4d8cc379fb7fa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0a23fb8a02d6a10e6df422b5f267c17c2ec953b3f66fe5e65bfc0fc4b40f22c63b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830185e18203e880a0767cf52173d391ad28fb882b0037c5285611b1ee141ee7641f58c4b94ff34f048880749f8e8b11d021f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -408,83 +428,218 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8a0ffd5a31c20db0f7246a396d901f9e10fcb03b39277746c95c4c18eea4ff8d",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8a0ffd5a31c20db0f7246a396d901f9e10fcb03b39277746c95c4c18eea4ff8d",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a0ffd5a31c20db0f7246a396d901f9e10fcb03b39277746c95c4c18eea4ff8da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9526fbe473cdf755a0424cb7f04c247c60cca0f9f096706b9c15b81895eb7d56",
+        "lastblockhash" : "0x68f3644bc853bf48b64f2fcb2ce1d85985752805d01f1d5a18f769b1a61fb507",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270b",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x05",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01",
                     "0x02" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f585e1",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbf7a1f",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x018875",
+                    "hash" : "0xa840e63878d5c9b9e935dbee6ac75b9a974c3a66379999bad3ad9603c795955d",
+                    "mixHash" : "0xca0813cf923fe3f00f1bc34158f0e3115d0dd9b16fe14b8767a1df6914667ce1",
+                    "nonce" : "0xbf018fde66f7c5c0",
+                    "number" : "0x01",
+                    "parentHash" : "0xf1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
+                    "receiptTrie" : "0xdb10d8429fd392ff097acdd5a413d3f5a004319b55a96d75f0b0f5b817b999a0",
+                    "stateRoot" : "0xb1a454dafaba3bfe0da0dc3a60962290b74bf3875090f3a5c6d1802cd0cee038",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b1a454dafaba3bfe0da0dc3a60962290b74bf3875090f3a5c6d1802cd0cee038a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0db10d8429fd392ff097acdd5a413d3f5a004319b55a96d75f0b0f5b817b999a0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830188758203e880a0ca0813cf923fe3f00f1bc34158f0e3115d0dd9b16fe14b8767a1df6914667ce188bf018fde66f7c5c0f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "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" : "0xa840e63878d5c9b9e935dbee6ac75b9a974c3a66379999bad3ad9603c795955d",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x270b",
+                "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006005f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
+                "balance" : "0x05",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f58875",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x00",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fbf778b",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0.json
index fccc8fe49..6f6df4f76 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodeInInitcodeToExistingContract_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016e49",
-                    "hash" : "5e6b598576e685c47930c773bbf93e3ef45795d1b4ce6004c36662168a3d6d48",
-                    "mixHash" : "3ba3ce7885319a01917bb4d6f1fd5b1902f2b95169c9e50ebc80d5ca41bddcc1",
-                    "nonce" : "d40b13db09af6563",
+                    "hash" : "0xf7b36b5b6e24f726ee97e981876381aca6ba8923215f2199d0d36c91af6abb85",
+                    "mixHash" : "0x9162369200dc20a7859d76d66947492d675d14c61ce2bb1df2bb8e4131085ea8",
+                    "nonce" : "0x858937f62efd7cf4",
                     "number" : "0x01",
-                    "parentHash" : "4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
-                    "receiptTrie" : "16c56252f327d0516fc414eb8a550510786529c4c9c68472afc21df0b5b1e0d5",
-                    "stateRoot" : "10035f49a7dc833d115e820f5f4b74174faa97d9cff54e59a1784349052b16b2",
+                    "parentHash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
+                    "receiptTrie" : "0x16c56252f327d0516fc414eb8a550510786529c4c9c68472afc21df0b5b1e0d5",
+                    "stateRoot" : "0x10035f49a7dc833d115e820f5f4b74174faa97d9cff54e59a1784349052b16b2",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010035f49a7dc833d115e820f5f4b74174faa97d9cff54e59a1784349052b16b2a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a016c56252f327d0516fc414eb8a550510786529c4c9c68472afc21df0b5b1e0d5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e498203e880a03ba3ce7885319a01917bb4d6f1fd5b1902f2b95169c9e50ebc80d5ca41bddcc188d40b13db09af6563f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010035f49a7dc833d115e820f5f4b74174faa97d9cff54e59a1784349052b16b2a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a016c56252f327d0516fc414eb8a550510786529c4c9c68472afc21df0b5b1e0d5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e498203e880a09162369200dc20a7859d76d66947492d675d14c61ce2bb1df2bb8e4131085ea888858937f62efd7cf4f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,97 +44,97 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "2b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "5e6b598576e685c47930c773bbf93e3ef45795d1b4ce6004c36662168a3d6d48",
+        "lastblockhash" : "0xf7b36b5b6e24f726ee97e981876381aca6ba8923215f2199d0d36c91af6abb85",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01",
                     "0x02" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56e49",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbf91b7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -137,36 +142,41 @@
         }
     },
     "callcodeInInitcodeToExistingContract_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016e49",
-                    "hash" : "384c824e9855d2b8962110f3f786a52c36b1e6686c5bf3fbd497eb0e7dbc7f34",
-                    "mixHash" : "38510b972a9cc882cbe589590d647920b1e56245b4a8d8f3087bd8cce0c9129b",
-                    "nonce" : "1227178e664c7356",
+                    "hash" : "0x555044f14385dac69ada6ef3e466cee40cf8751a7ab7cacc6a1ec7c68ad9f849",
+                    "mixHash" : "0xca771ea95bcb8f4546f6b2cd7d60b5d1a0f5f7091a0f2565cb5fa5194f29dc9c",
+                    "nonce" : "0xacc4acbda7879536",
                     "number" : "0x01",
-                    "parentHash" : "4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
-                    "receiptTrie" : "6cfa80dfe126efbd0ae1141c2bee935987192145db03a1fe62cadcbcdfd915af",
-                    "stateRoot" : "15a604bb035d1bffda4bc3afe02b6c1d701117b1b9050f8cdaed3a69a16e830a",
+                    "parentHash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
+                    "receiptTrie" : "0x6cfa80dfe126efbd0ae1141c2bee935987192145db03a1fe62cadcbcdfd915af",
+                    "stateRoot" : "0x15a604bb035d1bffda4bc3afe02b6c1d701117b1b9050f8cdaed3a69a16e830a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015a604bb035d1bffda4bc3afe02b6c1d701117b1b9050f8cdaed3a69a16e830aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a06cfa80dfe126efbd0ae1141c2bee935987192145db03a1fe62cadcbcdfd915afb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e498203e880a038510b972a9cc882cbe589590d647920b1e56245b4a8d8f3087bd8cce0c9129b881227178e664c7356f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015a604bb035d1bffda4bc3afe02b6c1d701117b1b9050f8cdaed3a69a16e830aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a06cfa80dfe126efbd0ae1141c2bee935987192145db03a1fe62cadcbcdfd915afb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e498203e880a0ca771ea95bcb8f4546f6b2cd7d60b5d1a0f5f7091a0f2565cb5fa5194f29dc9c88acc4acbda7879536f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -176,97 +186,97 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "2b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "384c824e9855d2b8962110f3f786a52c36b1e6686c5bf3fbd497eb0e7dbc7f34",
+        "lastblockhash" : "0x555044f14385dac69ada6ef3e466cee40cf8751a7ab7cacc6a1ec7c68ad9f849",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x01",
                     "0x02" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56e49",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbf91b7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -274,36 +284,41 @@
         }
     },
     "callcodeInInitcodeToExistingContract_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016bb5",
-                    "hash" : "1037a0ff64cc5af0df5cbd0279cd90f605d83d1c33be05f2d244d2ce75909450",
-                    "mixHash" : "80496a7c9a1676e5d50e31b3afafcef454563576f00985f5e63f184a4d06bf65",
-                    "nonce" : "cda359910913cde4",
+                    "hash" : "0xf5d91bffb1a227bfb9312c0b5c6a762fb4c69c7db34b7214056df514b35b47c0",
+                    "mixHash" : "0xfa6fa9c9a518c8361feb3a333f661a1dc42c86aacb7fefe4dcead64ae38b76ea",
+                    "nonce" : "0x56e0497b25ae50d1",
                     "number" : "0x01",
-                    "parentHash" : "4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
-                    "receiptTrie" : "7e365da6762e82bcf7121d100f5a3dab9f3e4bef9811853431639c036350f726",
-                    "stateRoot" : "89ac73bd8b05bbaa9ecbe834ef3f5fae921d2417395f8bc32912baa26f3ca54d",
+                    "parentHash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
+                    "receiptTrie" : "0x7e365da6762e82bcf7121d100f5a3dab9f3e4bef9811853431639c036350f726",
+                    "stateRoot" : "0x89ac73bd8b05bbaa9ecbe834ef3f5fae921d2417395f8bc32912baa26f3ca54d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089ac73bd8b05bbaa9ecbe834ef3f5fae921d2417395f8bc32912baa26f3ca54da074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07e365da6762e82bcf7121d100f5a3dab9f3e4bef9811853431639c036350f726b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb58203e880a080496a7c9a1676e5d50e31b3afafcef454563576f00985f5e63f184a4d06bf6588cda359910913cde4f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089ac73bd8b05bbaa9ecbe834ef3f5fae921d2417395f8bc32912baa26f3ca54da074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07e365da6762e82bcf7121d100f5a3dab9f3e4bef9811853431639c036350f726b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb58203e880a0fa6fa9c9a518c8361feb3a333f661a1dc42c86aacb7fefe4dcead64ae38b76ea8856e0497b25ae50d1f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -313,97 +328,97 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "2b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "1037a0ff64cc5af0df5cbd0279cd90f605d83d1c33be05f2d244d2ce75909450",
+        "lastblockhash" : "0xf5d91bffb1a227bfb9312c0b5c6a762fb4c69c7db34b7214056df514b35b47c0",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01",
                     "0x02" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56bb5",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbf944b",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -411,36 +426,41 @@
         }
     },
     "callcodeInInitcodeToExistingContract_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016bb5",
-                    "hash" : "90bc70b7d4feb9a1504a1a85e30fce39bc74dd5977160bb40ed7a25e9a3ce99c",
-                    "mixHash" : "1488aa1ee807ce58de44f3471889595e3fc067e50431997ac2bae1a5ff06dcb4",
-                    "nonce" : "2b2e94f2ae0f9b45",
+                    "hash" : "0x43fc836cda72a9f71e3418dcf51aa44e2a784d9fd15ecf39bff8cd8b10124b1d",
+                    "mixHash" : "0xfd4a065efd76e6140e569f3ea309d35c9253ab0189dc6d70f07ee1cd55a51901",
+                    "nonce" : "0xf514a6a9189dcefb",
                     "number" : "0x01",
-                    "parentHash" : "4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
-                    "receiptTrie" : "7e365da6762e82bcf7121d100f5a3dab9f3e4bef9811853431639c036350f726",
-                    "stateRoot" : "89ac73bd8b05bbaa9ecbe834ef3f5fae921d2417395f8bc32912baa26f3ca54d",
+                    "parentHash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
+                    "receiptTrie" : "0x7e365da6762e82bcf7121d100f5a3dab9f3e4bef9811853431639c036350f726",
+                    "stateRoot" : "0x89ac73bd8b05bbaa9ecbe834ef3f5fae921d2417395f8bc32912baa26f3ca54d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089ac73bd8b05bbaa9ecbe834ef3f5fae921d2417395f8bc32912baa26f3ca54da074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07e365da6762e82bcf7121d100f5a3dab9f3e4bef9811853431639c036350f726b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb58203e880a01488aa1ee807ce58de44f3471889595e3fc067e50431997ac2bae1a5ff06dcb4882b2e94f2ae0f9b45f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089ac73bd8b05bbaa9ecbe834ef3f5fae921d2417395f8bc32912baa26f3ca54da074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07e365da6762e82bcf7121d100f5a3dab9f3e4bef9811853431639c036350f726b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb58203e880a0fd4a065efd76e6140e569f3ea309d35c9253ab0189dc6d70f07ee1cd55a5190188f514a6a9189dcefbf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -450,97 +470,246 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "2b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "90bc70b7d4feb9a1504a1a85e30fce39bc74dd5977160bb40ed7a25e9a3ce99c",
+        "lastblockhash" : "0x43fc836cda72a9f71e3418dcf51aa44e2a784d9fd15ecf39bff8cd8b10124b1d",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01",
                     "0x02" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56bb5",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbf944b",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x016e49",
+                    "hash" : "0x0acb6e8718c61386d8d0994d9f3b0e832c1f2d657f161122eae4b1d072d6454d",
+                    "mixHash" : "0x019c1b03b20ab8a70870ed007f2a55a350db7c9a61d40121ec4054b7a0d4a424",
+                    "nonce" : "0xd20c2c1728d9bab7",
+                    "number" : "0x01",
+                    "parentHash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
+                    "receiptTrie" : "0x382632ca12e1fe05ab46b44af946f020d1002323b9e8bcd7799b1932b61142a9",
+                    "stateRoot" : "0xa2f8eaad77429c766485ac8cbdf1f85400b87953b44d7524204fd0546c4c5d0c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a2f8eaad77429c766485ac8cbdf1f85400b87953b44d7524204fd0546c4c5d0ca074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0382632ca12e1fe05ab46b44af946f020d1002323b9e8bcd7799b1932b61142a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e498203e880a0019c1b03b20ab8a70870ed007f2a55a350db7c9a61d40121ec4054b7a0d4a42488d20c2c1728d9bab7f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "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" : "0x0acb6e8718c61386d8d0994d9f3b0e832c1f2d657f161122eae4b1d072d6454d",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x270f",
+                "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x03e8",
+                "code" : "0x6460016000556000526005601b6001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f56e49",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x00",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fbf91b7",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcode_checkPC.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcode_checkPC_d0g0v0.json
index b0ba674c2..c97000135 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcode_checkPC.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcode_checkPC_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcode_checkPC_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcode_checkPC_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0xa306",
-                    "hash" : "d52fa47cce3b8cf2c1bb08f885f2581616012f12ee3a08cf88587c9bc22fdb3e",
-                    "mixHash" : "86373b2bbf231f77dedd91f16d37007ecd58a78d31b9b661ead2a577207fd436",
-                    "nonce" : "0e19c86971a122b2",
+                    "hash" : "0x0011816d96bdd1663715a91e927a238aef8f6a8046f145536596111bf3c11e59",
+                    "mixHash" : "0x44606597d8749e8a27582a99cd34a98d35be5435e7f279fa8ecc758eb007b991",
+                    "nonce" : "0x1ce2ed2aed3ae3f2",
                     "number" : "0x01",
-                    "parentHash" : "5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
-                    "receiptTrie" : "e19ad99d7a4a33a6d92f0d683697b7849cbfabae5763162978f475fef88583c8",
-                    "stateRoot" : "5b690bbfad4814122e2c0fdd803397cada968c13482305bd41468142d97bb5b3",
+                    "parentHash" : "0x5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
+                    "receiptTrie" : "0xe19ad99d7a4a33a6d92f0d683697b7849cbfabae5763162978f475fef88583c8",
+                    "stateRoot" : "0x5b690bbfad4814122e2c0fdd803397cada968c13482305bd41468142d97bb5b3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f8a05fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b690bbfad4814122e2c0fdd803397cada968c13482305bd41468142d97bb5b3a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0e19ad99d7a4a33a6d92f0d683697b7849cbfabae5763162978f475fef88583c8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0082a3068203e880a086373b2bbf231f77dedd91f16d37007ecd58a78d31b9b661ead2a577207fd436880e19c86971a122b2f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90261f901f8a05fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b690bbfad4814122e2c0fdd803397cada968c13482305bd41468142d97bb5b3a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0e19ad99d7a4a33a6d92f0d683697b7849cbfabae5763162978f475fef88583c8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0082a3068203e880a044606597d8749e8a27582a99cd34a98d35be5435e7f279fa8ecc758eb007b991881ce2ed2aed3ae3f2f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e2ce4837ca3e3d2c81f601580d9ecd4728049d2c9bf3a4fe534bf1a1ea001bfd",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe2ce4837ca3e3d2c81f601580d9ecd4728049d2c9bf3a4fe534bf1a1ea001bfd",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2ce4837ca3e3d2c81f601580d9ecd4728049d2c9bf3a4fe534bf1a1ea001bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d52fa47cce3b8cf2c1bb08f885f2581616012f12ee3a08cf88587c9bc22fdb3e",
+        "lastblockhash" : "0x0011816d96bdd1663715a91e927a238aef8f6a8046f145536596111bf3c11e59",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620f4240f15058600355",
                 "nonce" : "0x00",
@@ -68,46 +73,46 @@
                     "0x03" : "0x25"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4a306",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7635cfa",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620f4240f15058600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -115,36 +120,41 @@
         }
     },
     "callcode_checkPC_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcode_checkPC_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0xa306",
-                    "hash" : "6000e0e9557d8234cf09d478e13b973cea16ba41e30c3bc4d013c603167ab1e5",
-                    "mixHash" : "5805c21e5482828118f6457a696d7bdc55d74db5f20d75cd28738ab30e7dd3ab",
-                    "nonce" : "0ab06f52f0188302",
+                    "hash" : "0xe94d2b7b29e4393f807cf9f8a953fdd912092d9d3b715ca0a366de8d837d3105",
+                    "mixHash" : "0x05b89cf32224a07288a446959ccf5e1bae1e63fa7fed3cd1f62b6df26ffa045f",
+                    "nonce" : "0x92d5e28ca5d8ed76",
                     "number" : "0x01",
-                    "parentHash" : "5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
-                    "receiptTrie" : "e19ad99d7a4a33a6d92f0d683697b7849cbfabae5763162978f475fef88583c8",
-                    "stateRoot" : "5b690bbfad4814122e2c0fdd803397cada968c13482305bd41468142d97bb5b3",
+                    "parentHash" : "0x5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
+                    "receiptTrie" : "0xe19ad99d7a4a33a6d92f0d683697b7849cbfabae5763162978f475fef88583c8",
+                    "stateRoot" : "0x5b690bbfad4814122e2c0fdd803397cada968c13482305bd41468142d97bb5b3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f8a05fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b690bbfad4814122e2c0fdd803397cada968c13482305bd41468142d97bb5b3a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0e19ad99d7a4a33a6d92f0d683697b7849cbfabae5763162978f475fef88583c8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0082a3068203e880a05805c21e5482828118f6457a696d7bdc55d74db5f20d75cd28738ab30e7dd3ab880ab06f52f0188302f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90261f901f8a05fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b690bbfad4814122e2c0fdd803397cada968c13482305bd41468142d97bb5b3a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0e19ad99d7a4a33a6d92f0d683697b7849cbfabae5763162978f475fef88583c8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0082a3068203e880a005b89cf32224a07288a446959ccf5e1bae1e63fa7fed3cd1f62b6df26ffa045f8892d5e28ca5d8ed76f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -154,28 +164,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e2ce4837ca3e3d2c81f601580d9ecd4728049d2c9bf3a4fe534bf1a1ea001bfd",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe2ce4837ca3e3d2c81f601580d9ecd4728049d2c9bf3a4fe534bf1a1ea001bfd",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2ce4837ca3e3d2c81f601580d9ecd4728049d2c9bf3a4fe534bf1a1ea001bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "6000e0e9557d8234cf09d478e13b973cea16ba41e30c3bc4d013c603167ab1e5",
+        "lastblockhash" : "0xe94d2b7b29e4393f807cf9f8a953fdd912092d9d3b715ca0a366de8d837d3105",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620f4240f15058600355",
                 "nonce" : "0x00",
@@ -183,46 +193,46 @@
                     "0x03" : "0x25"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4a306",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7635cfa",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620f4240f15058600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -230,36 +240,41 @@
         }
     },
     "callcode_checkPC_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcode_checkPC_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0xa072",
-                    "hash" : "1c23adbba28e858615ba1b5ce60a80e9c3bed04dd2ceb116e452fea0f74cc455",
-                    "mixHash" : "b147399283753ddec928954b7a8afd2e750f5d3ed44933832f0b3a8d9db120e0",
-                    "nonce" : "ccad0d887bae15a4",
+                    "hash" : "0x5f9637fecbc20631fa81ccf7b3ea20103e151ea2bbe45613062994d298ed616f",
+                    "mixHash" : "0xcf9229a3cf4471c7018d2d00f7633bc6b5bddc3cf6e55c1ad6e503eebd5970c9",
+                    "nonce" : "0xde9fb8d14c7f9e0f",
                     "number" : "0x01",
-                    "parentHash" : "5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
-                    "receiptTrie" : "7e779ac6cdfd4d43cf3d2079ac020e0012c8319e934daa43bc311e9ce7162021",
-                    "stateRoot" : "1884e562f6d953b4401282638596de825366d90349038c8dfab9824396a35d1a",
+                    "parentHash" : "0x5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
+                    "receiptTrie" : "0x7e779ac6cdfd4d43cf3d2079ac020e0012c8319e934daa43bc311e9ce7162021",
+                    "stateRoot" : "0x1884e562f6d953b4401282638596de825366d90349038c8dfab9824396a35d1a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f8a05fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01884e562f6d953b4401282638596de825366d90349038c8dfab9824396a35d1aa06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a07e779ac6cdfd4d43cf3d2079ac020e0012c8319e934daa43bc311e9ce7162021b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0082a0728203e880a0b147399283753ddec928954b7a8afd2e750f5d3ed44933832f0b3a8d9db120e088ccad0d887bae15a4f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90261f901f8a05fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01884e562f6d953b4401282638596de825366d90349038c8dfab9824396a35d1aa06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a07e779ac6cdfd4d43cf3d2079ac020e0012c8319e934daa43bc311e9ce7162021b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0082a0728203e880a0cf9229a3cf4471c7018d2d00f7633bc6b5bddc3cf6e55c1ad6e503eebd5970c988de9fb8d14c7f9e0ff863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -269,28 +284,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e2ce4837ca3e3d2c81f601580d9ecd4728049d2c9bf3a4fe534bf1a1ea001bfd",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe2ce4837ca3e3d2c81f601580d9ecd4728049d2c9bf3a4fe534bf1a1ea001bfd",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2ce4837ca3e3d2c81f601580d9ecd4728049d2c9bf3a4fe534bf1a1ea001bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "1c23adbba28e858615ba1b5ce60a80e9c3bed04dd2ceb116e452fea0f74cc455",
+        "lastblockhash" : "0x5f9637fecbc20631fa81ccf7b3ea20103e151ea2bbe45613062994d298ed616f",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620f4240f15058600355",
                 "nonce" : "0x00",
@@ -298,46 +313,46 @@
                     "0x03" : "0x25"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4a072",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7635f8e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620f4240f15058600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -345,36 +360,41 @@
         }
     },
     "callcode_checkPC_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcode_checkPC_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0xa072",
-                    "hash" : "faeda7fd8e338f91e20e7597abece4cefc75b5367e15c8073902bee29b2c0d92",
-                    "mixHash" : "a443cfdd72b4abcbe498f99ad4f2576750379383c91de3f42e17fd13532360bf",
-                    "nonce" : "4d3fbd2cc6f875eb",
+                    "hash" : "0x4d760ee3600d7b6680b5b15aa2378022a1910b7bef90f35e7d659ce5f68f58bc",
+                    "mixHash" : "0x4e8f61432a22f6541e9d06a94e172b99260121d5dc5e401dc96a3e7356111e9c",
+                    "nonce" : "0xeeaca494708ca506",
                     "number" : "0x01",
-                    "parentHash" : "5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
-                    "receiptTrie" : "7e779ac6cdfd4d43cf3d2079ac020e0012c8319e934daa43bc311e9ce7162021",
-                    "stateRoot" : "1884e562f6d953b4401282638596de825366d90349038c8dfab9824396a35d1a",
+                    "parentHash" : "0x5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
+                    "receiptTrie" : "0x7e779ac6cdfd4d43cf3d2079ac020e0012c8319e934daa43bc311e9ce7162021",
+                    "stateRoot" : "0x1884e562f6d953b4401282638596de825366d90349038c8dfab9824396a35d1a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f8a05fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01884e562f6d953b4401282638596de825366d90349038c8dfab9824396a35d1aa06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a07e779ac6cdfd4d43cf3d2079ac020e0012c8319e934daa43bc311e9ce7162021b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0082a0728203e880a0a443cfdd72b4abcbe498f99ad4f2576750379383c91de3f42e17fd13532360bf884d3fbd2cc6f875ebf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90261f901f8a05fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01884e562f6d953b4401282638596de825366d90349038c8dfab9824396a35d1aa06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a07e779ac6cdfd4d43cf3d2079ac020e0012c8319e934daa43bc311e9ce7162021b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0082a0728203e880a04e8f61432a22f6541e9d06a94e172b99260121d5dc5e401dc96a3e7356111e9c88eeaca494708ca506f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -384,28 +404,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e2ce4837ca3e3d2c81f601580d9ecd4728049d2c9bf3a4fe534bf1a1ea001bfd",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe2ce4837ca3e3d2c81f601580d9ecd4728049d2c9bf3a4fe534bf1a1ea001bfd",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2ce4837ca3e3d2c81f601580d9ecd4728049d2c9bf3a4fe534bf1a1ea001bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "faeda7fd8e338f91e20e7597abece4cefc75b5367e15c8073902bee29b2c0d92",
+        "lastblockhash" : "0x4d760ee3600d7b6680b5b15aa2378022a1910b7bef90f35e7d659ce5f68f58bc",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620f4240f15058600355",
                 "nonce" : "0x00",
@@ -413,46 +433,173 @@
                     "0x03" : "0x25"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4a072",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7635f8e",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcode_checkPC_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0xb2d05e00",
+                    "gasUsed" : "0xa306",
+                    "hash" : "0xdcf6044355cdaaedb689f2d7e6ea304263dd7a4ff1c8f083cc36acce8ac62d79",
+                    "mixHash" : "0xdf52935aabd7918098841e22162fe88c28e37446233274ccd047bec7e59988f0",
+                    "nonce" : "0x9158ab72ce8b754e",
+                    "number" : "0x01",
+                    "parentHash" : "0x5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
+                    "receiptTrie" : "0x16462552e8851b6efdc7a81cb2a4bf1504cf1162e140471e001c3825244862dc",
+                    "stateRoot" : "0xae9b4e8f695435c0bcc2fdc8802febb91a1c5acb71097f9e121415ec97979b1d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f8a05fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae9b4e8f695435c0bcc2fdc8802febb91a1c5acb71097f9e121415ec97979b1da06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a016462552e8851b6efdc7a81cb2a4bf1504cf1162e140471e001c3825244862dcb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0082a3068203e880a0df52935aabd7918098841e22162fe88c28e37446233274ccd047bec7e59988f0889158ab72ce8b754ef863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "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" : "0xdcf6044355cdaaedb689f2d7e6ea304263dd7a4ff1c8f083cc36acce8ac62d79",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620f4240f15058600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_OOGE.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_OOGE_d0g0v0.json
index 31cac450a..3b7e8b5cb 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_OOGE.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_OOGE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecall_10_OOGE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecall_10_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010798",
-                    "hash" : "cc873d7a22fc9c28dfd415897109fee71c0c224bd545ce1ab94fdd4eb1327a97",
-                    "mixHash" : "a04e610eefc7cafdc2916cb9936f109a6a9a5507a5ac1d63df58c21e368341ea",
-                    "nonce" : "a120fdbbcb2a0802",
+                    "hash" : "0x9765d1d62b64575a8187a3307e16c3e445b16c4f342e211fae7e21ad02b6e538",
+                    "mixHash" : "0xa6f3b47fdea96a9233942ccef4abd5ca600780e2d0bcc6d3d10734d18cda1ab1",
+                    "nonce" : "0xde6e400be745915d",
                     "number" : "0x01",
-                    "parentHash" : "7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
-                    "receiptTrie" : "9b504c3ee508f69978063107d751e6b06b10105f75d01e20a5aa197a64054662",
-                    "stateRoot" : "be42cf8f46fab05d875afe066db80fde066218409de0df46a323cbced06049ae",
+                    "parentHash" : "0x7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
+                    "receiptTrie" : "0x9b504c3ee508f69978063107d751e6b06b10105f75d01e20a5aa197a64054662",
+                    "stateRoot" : "0xbe42cf8f46fab05d875afe066db80fde066218409de0df46a323cbced06049ae",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a07e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0be42cf8f46fab05d875afe066db80fde066218409de0df46a323cbced06049aea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09b504c3ee508f69978063107d751e6b06b10105f75d01e20a5aa197a64054662b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0a04e610eefc7cafdc2916cb9936f109a6a9a5507a5ac1d63df58c21e368341ea88a120fdbbcb2a0802f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a07e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0be42cf8f46fab05d875afe066db80fde066218409de0df46a323cbced06049aea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09b504c3ee508f69978063107d751e6b06b10105f75d01e20a5aa197a64054662b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0a6f3b47fdea96a9233942ccef4abd5ca600780e2d0bcc6d3d10734d18cda1ab188de6e400be745915df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "3ddea46196aa21d0f07f42ac336cfd37c3dabe3c5ba55ecc0a3d00a66fe61211",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3ddea46196aa21d0f07f42ac336cfd37c3dabe3c5ba55ecc0a3d00a66fe61211",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ddea46196aa21d0f07f42ac336cfd37c3dabe3c5ba55ecc0a3d00a66fe61211a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "cc873d7a22fc9c28dfd415897109fee71c0c224bd545ce1ab94fdd4eb1327a97",
+        "lastblockhash" : "0x9765d1d62b64575a8187a3307e16c3e445b16c4f342e211fae7e21ad02b6e538",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -68,60 +73,60 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f50798",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762f868",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -129,36 +134,41 @@
         }
     },
     "callcodecall_10_OOGE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecall_10_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010798",
-                    "hash" : "9f75bc507533f500af1c493be173bb23afd42c5d9d63ec546de315f04563df7f",
-                    "mixHash" : "977ac747db0b30ab06f0ef4a21c6558df682e534cd163fe9369e31d79a8cf8b5",
-                    "nonce" : "cbd6f4eb3a5527b7",
+                    "hash" : "0x6c20c6c2160a3a101c7663a41f1a6ceb9cb48bf37677db29d37705f6811b75fb",
+                    "mixHash" : "0x8201179f1e286cdf9cb5b58107a06b35b0ff1ee6fdc2f21c8c040fbc145ff706",
+                    "nonce" : "0x82e0a17f26beaa68",
                     "number" : "0x01",
-                    "parentHash" : "7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
-                    "receiptTrie" : "9b504c3ee508f69978063107d751e6b06b10105f75d01e20a5aa197a64054662",
-                    "stateRoot" : "be42cf8f46fab05d875afe066db80fde066218409de0df46a323cbced06049ae",
+                    "parentHash" : "0x7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
+                    "receiptTrie" : "0x9b504c3ee508f69978063107d751e6b06b10105f75d01e20a5aa197a64054662",
+                    "stateRoot" : "0xbe42cf8f46fab05d875afe066db80fde066218409de0df46a323cbced06049ae",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a07e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0be42cf8f46fab05d875afe066db80fde066218409de0df46a323cbced06049aea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09b504c3ee508f69978063107d751e6b06b10105f75d01e20a5aa197a64054662b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0977ac747db0b30ab06f0ef4a21c6558df682e534cd163fe9369e31d79a8cf8b588cbd6f4eb3a5527b7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a07e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0be42cf8f46fab05d875afe066db80fde066218409de0df46a323cbced06049aea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09b504c3ee508f69978063107d751e6b06b10105f75d01e20a5aa197a64054662b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a08201179f1e286cdf9cb5b58107a06b35b0ff1ee6fdc2f21c8c040fbc145ff7068882e0a17f26beaa68f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -168,28 +178,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "3ddea46196aa21d0f07f42ac336cfd37c3dabe3c5ba55ecc0a3d00a66fe61211",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3ddea46196aa21d0f07f42ac336cfd37c3dabe3c5ba55ecc0a3d00a66fe61211",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ddea46196aa21d0f07f42ac336cfd37c3dabe3c5ba55ecc0a3d00a66fe61211a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9f75bc507533f500af1c493be173bb23afd42c5d9d63ec546de315f04563df7f",
+        "lastblockhash" : "0x6c20c6c2160a3a101c7663a41f1a6ceb9cb48bf37677db29d37705f6811b75fb",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -197,60 +207,60 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f50798",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762f868",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -258,36 +268,41 @@
         }
     },
     "callcodecall_10_OOGE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecall_10_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010270",
-                    "hash" : "1a66d8556edf51145af61c85ca2bb1145480655a96b076b249f51125a6b2e1d1",
-                    "mixHash" : "4f1aae86d5f7c9430b6395fc58613bb244a89217273f19e7a0b837553e771092",
-                    "nonce" : "419e5f699ccbb4a2",
+                    "hash" : "0xd7fd5493e1e1b68cbd2a2332fc91502088d28e0d63a0b984865e71e482b51493",
+                    "mixHash" : "0xb74a8bc96439bb47ae3bb3f3ca12e17d08c15dd86d0406ba875f62450a7b138c",
+                    "nonce" : "0x213ae8f7bb11f96d",
                     "number" : "0x01",
-                    "parentHash" : "7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
-                    "receiptTrie" : "a9f17cb40dbb3da9dcec2ad620b1afd2f87effc45fb6abd1e8069ae0a25195e1",
-                    "stateRoot" : "c23e810d8ab429560d04bdedbddf72a79e9910fb055bafeac85a0695cc16b05a",
+                    "parentHash" : "0x7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
+                    "receiptTrie" : "0xa9f17cb40dbb3da9dcec2ad620b1afd2f87effc45fb6abd1e8069ae0a25195e1",
+                    "stateRoot" : "0xc23e810d8ab429560d04bdedbddf72a79e9910fb055bafeac85a0695cc16b05a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a07e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c23e810d8ab429560d04bdedbddf72a79e9910fb055bafeac85a0695cc16b05aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a9f17cb40dbb3da9dcec2ad620b1afd2f87effc45fb6abd1e8069ae0a25195e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a04f1aae86d5f7c9430b6395fc58613bb244a89217273f19e7a0b837553e77109288419e5f699ccbb4a2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a07e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c23e810d8ab429560d04bdedbddf72a79e9910fb055bafeac85a0695cc16b05aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a9f17cb40dbb3da9dcec2ad620b1afd2f87effc45fb6abd1e8069ae0a25195e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a0b74a8bc96439bb47ae3bb3f3ca12e17d08c15dd86d0406ba875f62450a7b138c88213ae8f7bb11f96df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -297,28 +312,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "3ddea46196aa21d0f07f42ac336cfd37c3dabe3c5ba55ecc0a3d00a66fe61211",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3ddea46196aa21d0f07f42ac336cfd37c3dabe3c5ba55ecc0a3d00a66fe61211",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ddea46196aa21d0f07f42ac336cfd37c3dabe3c5ba55ecc0a3d00a66fe61211a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "1a66d8556edf51145af61c85ca2bb1145480655a96b076b249f51125a6b2e1d1",
+        "lastblockhash" : "0xd7fd5493e1e1b68cbd2a2332fc91502088d28e0d63a0b984865e71e482b51493",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -326,60 +341,60 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f50270",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762fd90",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -387,36 +402,41 @@
         }
     },
     "callcodecall_10_OOGE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecall_10_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010270",
-                    "hash" : "e71cd87e7e2a36f97e2738cd691079157a4fff29723cf187602d6b74895961a1",
-                    "mixHash" : "e821d274722215ca958c18edb00916c13906e48478a22cf0b205497d3c718ddd",
-                    "nonce" : "ade35f3d56a331a8",
+                    "hash" : "0xe9efe3d201fc6f66d88d596084f61d3345fb7acf80f5d03c0632d66dfccdf746",
+                    "mixHash" : "0x367cc8d87923ef67d8e9c0eaf4569cdda6cb52dbf9b710ed3d8ab09dc89d4c9d",
+                    "nonce" : "0x58757d0ce57d8bf2",
                     "number" : "0x01",
-                    "parentHash" : "7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
-                    "receiptTrie" : "a9f17cb40dbb3da9dcec2ad620b1afd2f87effc45fb6abd1e8069ae0a25195e1",
-                    "stateRoot" : "c23e810d8ab429560d04bdedbddf72a79e9910fb055bafeac85a0695cc16b05a",
+                    "parentHash" : "0x7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
+                    "receiptTrie" : "0xa9f17cb40dbb3da9dcec2ad620b1afd2f87effc45fb6abd1e8069ae0a25195e1",
+                    "stateRoot" : "0xc23e810d8ab429560d04bdedbddf72a79e9910fb055bafeac85a0695cc16b05a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a07e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c23e810d8ab429560d04bdedbddf72a79e9910fb055bafeac85a0695cc16b05aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a9f17cb40dbb3da9dcec2ad620b1afd2f87effc45fb6abd1e8069ae0a25195e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a0e821d274722215ca958c18edb00916c13906e48478a22cf0b205497d3c718ddd88ade35f3d56a331a8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a07e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c23e810d8ab429560d04bdedbddf72a79e9910fb055bafeac85a0695cc16b05aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a9f17cb40dbb3da9dcec2ad620b1afd2f87effc45fb6abd1e8069ae0a25195e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a0367cc8d87923ef67d8e9c0eaf4569cdda6cb52dbf9b710ed3d8ab09dc89d4c9d8858757d0ce57d8bf2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -426,28 +446,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "3ddea46196aa21d0f07f42ac336cfd37c3dabe3c5ba55ecc0a3d00a66fe61211",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3ddea46196aa21d0f07f42ac336cfd37c3dabe3c5ba55ecc0a3d00a66fe61211",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ddea46196aa21d0f07f42ac336cfd37c3dabe3c5ba55ecc0a3d00a66fe61211a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e71cd87e7e2a36f97e2738cd691079157a4fff29723cf187602d6b74895961a1",
+        "lastblockhash" : "0xe9efe3d201fc6f66d88d596084f61d3345fb7acf80f5d03c0632d66dfccdf746",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -455,60 +475,201 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f50270",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762fd90",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x779df45e36e94be87b77d32cf1f430f4f6340e6dd04bb560998b5065dd537255",
+                    "mixHash" : "0xa58fb56747d89980a4610a72c1c666c3cd6431206e5f1ef3b5e66fdcf8a40e17",
+                    "nonce" : "0xa0f3476c09034f42",
+                    "number" : "0x01",
+                    "parentHash" : "0x7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
+                    "receiptTrie" : "0xfca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834",
+                    "stateRoot" : "0x873d3ad663f51f8014732ec069302d0e4a00cd1d4f57aaa1fd8ab7c5a9f4f62f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a07e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0873d3ad663f51f8014732ec069302d0e4a00cd1d4f57aaa1fd8ab7c5a9f4f62fa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0a58fb56747d89980a4610a72c1c666c3cd6431206e5f1ef3b5e66fdcf8a40e1788a0f3476c09034f42f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0x779df45e36e94be87b77d32cf1f430f4f6340e6dd04bb560998b5065dd537255",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd_d0g0v0.json
index 481eb48ef..cfb7dacc0 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecall_10_SuicideEnd_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecall_10_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ed",
-                    "hash" : "251dac0aef08b6b090b7cc44d3179401e21a2aab05bfe86a28859b9ad3e5996f",
-                    "mixHash" : "3044aae04aeb54e20eecae8237f48499d2ea5393c39c5ebbf320096cb1e5961e",
-                    "nonce" : "b98213962ca045b7",
+                    "hash" : "0xc35fa491752c84b5b35c5e8a1d118a3d73de28c62d180901f0edaab3b8e6ca19",
+                    "mixHash" : "0xa10e733bc7f1ba5f09c00341c02f870828e9a3aca758ef9c34e3d17a5224ba3f",
+                    "nonce" : "0x674c93af24892c15",
                     "number" : "0x01",
-                    "parentHash" : "f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
-                    "receiptTrie" : "85924e954180c9c8dfb31939caef07c45de6464bd46b6cf3047c7e5d70d193fc",
-                    "stateRoot" : "90d950ac1eda938c2b8c6dbce037f57b2b9a0c94ba107bb835db18a323a10da3",
+                    "parentHash" : "0xf4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
+                    "receiptTrie" : "0x85924e954180c9c8dfb31939caef07c45de6464bd46b6cf3047c7e5d70d193fc",
+                    "stateRoot" : "0x90d950ac1eda938c2b8c6dbce037f57b2b9a0c94ba107bb835db18a323a10da3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090d950ac1eda938c2b8c6dbce037f57b2b9a0c94ba107bb835db18a323a10da3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a085924e954180c9c8dfb31939caef07c45de6464bd46b6cf3047c7e5d70d193fcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a03044aae04aeb54e20eecae8237f48499d2ea5393c39c5ebbf320096cb1e5961e88b98213962ca045b7f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090d950ac1eda938c2b8c6dbce037f57b2b9a0c94ba107bb835db18a323a10da3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a085924e954180c9c8dfb31939caef07c45de6464bd46b6cf3047c7e5d70d193fcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0a10e733bc7f1ba5f09c00341c02f870828e9a3aca758ef9c34e3d17a5224ba3f88674c93af24892c15f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,35 +44,35 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8813b7ad9867b00f6a412b3d6422ead53e94dc9a8131ffb3028d6c594954cabb",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8813b7ad9867b00f6a412b3d6422ead53e94dc9a8131ffb3028d6c594954cabb",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08813b7ad9867b00f6a412b3d6422ead53e94dc9a8131ffb3028d6c594954cabba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "251dac0aef08b6b090b7cc44d3179401e21a2aab05bfe86a28859b9ad3e5996f",
+        "lastblockhash" : "0xc35fa491752c84b5b35c5e8a1d118a3d73de28c62d180901f0edaab3b8e6ca19",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
@@ -75,46 +80,46 @@
                     "0x02" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f7ed",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7630813",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -122,36 +127,41 @@
         }
     },
     "callcodecall_10_SuicideEnd_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecall_10_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ed",
-                    "hash" : "99b747967298f203291c0b4345a2b934c898259f6f6a39f581c358c9010cad00",
-                    "mixHash" : "e80fd18d0b97dd1ae97342db044fa3f39b17069cf2511589d2c0fde85ed8fb52",
-                    "nonce" : "5a63f8a4ac60dd7d",
+                    "hash" : "0x3c8f8f377b238cbf389bc6354c2e96745b44d8043b741ee02a1239be83f50af6",
+                    "mixHash" : "0x554a8be3fbc56022b272856ab3462dc1fcf9de799adc8e352188374bd22d652c",
+                    "nonce" : "0x939d737e8bf0eaff",
                     "number" : "0x01",
-                    "parentHash" : "f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
-                    "receiptTrie" : "85924e954180c9c8dfb31939caef07c45de6464bd46b6cf3047c7e5d70d193fc",
-                    "stateRoot" : "90d950ac1eda938c2b8c6dbce037f57b2b9a0c94ba107bb835db18a323a10da3",
+                    "parentHash" : "0xf4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
+                    "receiptTrie" : "0x85924e954180c9c8dfb31939caef07c45de6464bd46b6cf3047c7e5d70d193fc",
+                    "stateRoot" : "0x90d950ac1eda938c2b8c6dbce037f57b2b9a0c94ba107bb835db18a323a10da3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090d950ac1eda938c2b8c6dbce037f57b2b9a0c94ba107bb835db18a323a10da3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a085924e954180c9c8dfb31939caef07c45de6464bd46b6cf3047c7e5d70d193fcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0e80fd18d0b97dd1ae97342db044fa3f39b17069cf2511589d2c0fde85ed8fb52885a63f8a4ac60dd7df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090d950ac1eda938c2b8c6dbce037f57b2b9a0c94ba107bb835db18a323a10da3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a085924e954180c9c8dfb31939caef07c45de6464bd46b6cf3047c7e5d70d193fcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0554a8be3fbc56022b272856ab3462dc1fcf9de799adc8e352188374bd22d652c88939d737e8bf0eafff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -161,35 +171,35 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8813b7ad9867b00f6a412b3d6422ead53e94dc9a8131ffb3028d6c594954cabb",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8813b7ad9867b00f6a412b3d6422ead53e94dc9a8131ffb3028d6c594954cabb",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08813b7ad9867b00f6a412b3d6422ead53e94dc9a8131ffb3028d6c594954cabba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "99b747967298f203291c0b4345a2b934c898259f6f6a39f581c358c9010cad00",
+        "lastblockhash" : "0x3c8f8f377b238cbf389bc6354c2e96745b44d8043b741ee02a1239be83f50af6",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
@@ -197,46 +207,46 @@
                     "0x02" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f7ed",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7630813",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -244,36 +254,41 @@
         }
     },
     "callcodecall_10_SuicideEnd_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecall_10_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xdf3d",
-                    "hash" : "aafdfb77a0dc0778e7703d69f032f7bd587bc2f35440ef3afe8446e8a742dd08",
-                    "mixHash" : "9829bdd77aefcad37335b92d1a47b9898c0040111f19bf271220186178c95120",
-                    "nonce" : "4c412127f57b97a4",
+                    "hash" : "0xbcde9c007fb0191ddb1e7b0684084f58e450cb803258a9e8f4915640949fdef0",
+                    "mixHash" : "0x8987b18fec7a305074ea92c45ca29ac1acc220441eb5c12f8a4a3897bf2f3c31",
+                    "nonce" : "0x546fde69051fed11",
                     "number" : "0x01",
-                    "parentHash" : "f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
-                    "receiptTrie" : "937ac7006289079a3b10d71178254febe00da135a2e23214f8f3b9473a2fdad7",
-                    "stateRoot" : "1cc0d0739cc4d3ebde79c51d13c9a736608ecbfb1977e19a6cf463c0728239aa",
+                    "parentHash" : "0xf4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
+                    "receiptTrie" : "0x937ac7006289079a3b10d71178254febe00da135a2e23214f8f3b9473a2fdad7",
+                    "stateRoot" : "0x1cc0d0739cc4d3ebde79c51d13c9a736608ecbfb1977e19a6cf463c0728239aa",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc0d0739cc4d3ebde79c51d13c9a736608ecbfb1977e19a6cf463c0728239aaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0937ac7006289079a3b10d71178254febe00da135a2e23214f8f3b9473a2fdad7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a09829bdd77aefcad37335b92d1a47b9898c0040111f19bf271220186178c95120884c412127f57b97a4f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc0d0739cc4d3ebde79c51d13c9a736608ecbfb1977e19a6cf463c0728239aaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0937ac7006289079a3b10d71178254febe00da135a2e23214f8f3b9473a2fdad7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a08987b18fec7a305074ea92c45ca29ac1acc220441eb5c12f8a4a3897bf2f3c3188546fde69051fed11f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -283,35 +298,35 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8813b7ad9867b00f6a412b3d6422ead53e94dc9a8131ffb3028d6c594954cabb",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8813b7ad9867b00f6a412b3d6422ead53e94dc9a8131ffb3028d6c594954cabb",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08813b7ad9867b00f6a412b3d6422ead53e94dc9a8131ffb3028d6c594954cabba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "aafdfb77a0dc0778e7703d69f032f7bd587bc2f35440ef3afe8446e8a742dd08",
+        "lastblockhash" : "0xbcde9c007fb0191ddb1e7b0684084f58e450cb803258a9e8f4915640949fdef0",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
@@ -319,46 +334,46 @@
                     "0x02" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4df3d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a76320c3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -366,36 +381,41 @@
         }
     },
     "callcodecall_10_SuicideEnd_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecall_10_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xdf3d",
-                    "hash" : "0c74be0250c3c4d24980523c7f40f80606651697caf040d6fb70f03623e817a6",
-                    "mixHash" : "c84f6dbbe075f41d7395eec2677be5f266a9f71b6a141d3af3be74be3c3f5b51",
-                    "nonce" : "5e1246eb27dc40ef",
+                    "hash" : "0x72ee3a7424b0d9402d4cd504cb6f0dab8a0a7478fe803a53c4e251b37fc9c7ef",
+                    "mixHash" : "0xa779c507d0c185dfa2c010295eccf9c5bc313462fd10de0c3570a29a41410ad3",
+                    "nonce" : "0x0abff034869e393a",
                     "number" : "0x01",
-                    "parentHash" : "f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
-                    "receiptTrie" : "937ac7006289079a3b10d71178254febe00da135a2e23214f8f3b9473a2fdad7",
-                    "stateRoot" : "1cc0d0739cc4d3ebde79c51d13c9a736608ecbfb1977e19a6cf463c0728239aa",
+                    "parentHash" : "0xf4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
+                    "receiptTrie" : "0x937ac7006289079a3b10d71178254febe00da135a2e23214f8f3b9473a2fdad7",
+                    "stateRoot" : "0x1cc0d0739cc4d3ebde79c51d13c9a736608ecbfb1977e19a6cf463c0728239aa",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc0d0739cc4d3ebde79c51d13c9a736608ecbfb1977e19a6cf463c0728239aaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0937ac7006289079a3b10d71178254febe00da135a2e23214f8f3b9473a2fdad7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0c84f6dbbe075f41d7395eec2677be5f266a9f71b6a141d3af3be74be3c3f5b51885e1246eb27dc40eff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc0d0739cc4d3ebde79c51d13c9a736608ecbfb1977e19a6cf463c0728239aaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0937ac7006289079a3b10d71178254febe00da135a2e23214f8f3b9473a2fdad7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0a779c507d0c185dfa2c010295eccf9c5bc313462fd10de0c3570a29a41410ad3880abff034869e393af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -405,35 +425,35 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8813b7ad9867b00f6a412b3d6422ead53e94dc9a8131ffb3028d6c594954cabb",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8813b7ad9867b00f6a412b3d6422ead53e94dc9a8131ffb3028d6c594954cabb",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08813b7ad9867b00f6a412b3d6422ead53e94dc9a8131ffb3028d6c594954cabba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0c74be0250c3c4d24980523c7f40f80606651697caf040d6fb70f03623e817a6",
+        "lastblockhash" : "0x72ee3a7424b0d9402d4cd504cb6f0dab8a0a7478fe803a53c4e251b37fc9c7ef",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
@@ -441,46 +461,180 @@
                     "0x02" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4df3d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a76320c3",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xd55d86fcbd28fae9aa9e14ea2169d51f667bc6b4d1d09ec7235e1a1aefe8fc18",
+                    "mixHash" : "0xb4c07064a01263d2fa4c808f44c8ad4ae53613bcd019d17f5912aa1d57683572",
+                    "nonce" : "0x0be1bd20a2ab50f2",
+                    "number" : "0x01",
+                    "parentHash" : "0xf4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
+                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
+                    "stateRoot" : "0x0a075046f393937b867deea635f5953c4afd2c0baf587ddbcf05ba08d88d2e3e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a075046f393937b867deea635f5953c4afd2c0baf587ddbcf05ba08d88d2e3ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0b4c07064a01263d2fa4c808f44c8ad4ae53613bcd019d17f5912aa1d57683572880be1bd20a2ab50f2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xd55d86fcbd28fae9aa9e14ea2169d51f667bc6b4d1d09ec7235e1a1aefe8fc18",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_d0g0v0.json
index a27b3c8d6..8f7b7d7f0 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecall_10_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecall_10_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03997d",
-                    "hash" : "ce51291193b374b9b19bf97da692d73181e44be307abf610d6d54a10aa1968ae",
-                    "mixHash" : "b52516858c52f9b7ad0620fa34fa2c74ac92e1056c564bc8688e0d1648208ce5",
-                    "nonce" : "ee2b5286a9d2077f",
+                    "hash" : "0x635c69895fde22a3242b71c3fc4f258201d28543f4da8f0f44e36728d6583300",
+                    "mixHash" : "0x95aa5aa5a995208a53a5df1a3d533542adabbdf1512931c88280515584f3cfc5",
+                    "nonce" : "0x2a405d53e29af1ed",
                     "number" : "0x01",
-                    "parentHash" : "35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
-                    "receiptTrie" : "9b17e7d1ad4b27088a4495040750f5756b48a7284bbf0d26fe8e4919548ca591",
-                    "stateRoot" : "dc9f477de06a01e74500648fe545b7e999f2401859891fca6fd44e79946c4737",
+                    "parentHash" : "0x35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
+                    "receiptTrie" : "0x9b17e7d1ad4b27088a4495040750f5756b48a7284bbf0d26fe8e4919548ca591",
+                    "stateRoot" : "0xdc9f477de06a01e74500648fe545b7e999f2401859891fca6fd44e79946c4737",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a035d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc9f477de06a01e74500648fe545b7e999f2401859891fca6fd44e79946c4737a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09b17e7d1ad4b27088a4495040750f5756b48a7284bbf0d26fe8e4919548ca591b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a0b52516858c52f9b7ad0620fa34fa2c74ac92e1056c564bc8688e0d1648208ce588ee2b5286a9d2077ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a035d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc9f477de06a01e74500648fe545b7e999f2401859891fca6fd44e79946c4737a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09b17e7d1ad4b27088a4495040750f5756b48a7284bbf0d26fe8e4919548ca591b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a095aa5aa5a995208a53a5df1a3d533542adabbdf1512931c88280515584f3cfc5882a405d53e29af1edf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "d2f1b5b3faed93a50f8efe19bbc40d0f6564d8dcf0b0990d6b3a075c7028def1",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd2f1b5b3faed93a50f8efe19bbc40d0f6564d8dcf0b0990d6b3a075c7028def1",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2f1b5b3faed93a50f8efe19bbc40d0f6564d8dcf0b0990d6b3a075c7028def1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ce51291193b374b9b19bf97da692d73181e44be307abf610d6d54a10aa1968ae",
+        "lastblockhash" : "0x635c69895fde22a3242b71c3fc4f258201d28543f4da8f0f44e36728d6583300",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -69,14 +74,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
@@ -91,46 +96,46 @@
                     "0xf0" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7997d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7606683",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -138,36 +143,41 @@
         }
     },
     "callcodecall_10_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecall_10_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03997d",
-                    "hash" : "5b40b504744b379dcccd301af9177f0c858849f29be87e8ec823f1d0598dda16",
-                    "mixHash" : "5557aacf5e862d0c918cd053b45886891fea91d012e6339161643a8056b2afe6",
-                    "nonce" : "c8ccc686dd089e75",
+                    "hash" : "0xe1eea430f6516fb4dae389ee05d4b5b5464ec27eb1d2a47b99d48e8854f00152",
+                    "mixHash" : "0x1f5f8e95d599409432f3df0b428bb639eccfa1635076414618c5c14fbc38c50f",
+                    "nonce" : "0xff916f1a96ac39fd",
                     "number" : "0x01",
-                    "parentHash" : "35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
-                    "receiptTrie" : "9b17e7d1ad4b27088a4495040750f5756b48a7284bbf0d26fe8e4919548ca591",
-                    "stateRoot" : "dc9f477de06a01e74500648fe545b7e999f2401859891fca6fd44e79946c4737",
+                    "parentHash" : "0x35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
+                    "receiptTrie" : "0x9b17e7d1ad4b27088a4495040750f5756b48a7284bbf0d26fe8e4919548ca591",
+                    "stateRoot" : "0xdc9f477de06a01e74500648fe545b7e999f2401859891fca6fd44e79946c4737",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a035d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc9f477de06a01e74500648fe545b7e999f2401859891fca6fd44e79946c4737a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09b17e7d1ad4b27088a4495040750f5756b48a7284bbf0d26fe8e4919548ca591b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a05557aacf5e862d0c918cd053b45886891fea91d012e6339161643a8056b2afe688c8ccc686dd089e75f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a035d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc9f477de06a01e74500648fe545b7e999f2401859891fca6fd44e79946c4737a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09b17e7d1ad4b27088a4495040750f5756b48a7284bbf0d26fe8e4919548ca591b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a01f5f8e95d599409432f3df0b428bb639eccfa1635076414618c5c14fbc38c50f88ff916f1a96ac39fdf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -177,28 +187,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "d2f1b5b3faed93a50f8efe19bbc40d0f6564d8dcf0b0990d6b3a075c7028def1",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd2f1b5b3faed93a50f8efe19bbc40d0f6564d8dcf0b0990d6b3a075c7028def1",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2f1b5b3faed93a50f8efe19bbc40d0f6564d8dcf0b0990d6b3a075c7028def1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "5b40b504744b379dcccd301af9177f0c858849f29be87e8ec823f1d0598dda16",
+        "lastblockhash" : "0xe1eea430f6516fb4dae389ee05d4b5b5464ec27eb1d2a47b99d48e8854f00152",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -207,14 +217,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
@@ -229,46 +239,46 @@
                     "0xf0" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7997d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7606683",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -276,36 +286,41 @@
         }
     },
     "callcodecall_10_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecall_10_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x039455",
-                    "hash" : "35b5f38a7f9a8314cecd9a369f8f06b8486649b96c506ee998ffc40b5140f3e3",
-                    "mixHash" : "f910b03720c1356823a9d9f0af32d7302049a8e2095d53dbba03f9cffb541051",
-                    "nonce" : "33847afef4d9dca5",
+                    "hash" : "0x6433ba8e49fa6c2ffa13a6f5356fb6eeb7ee5cc0706a9185b75bb336bcf0dabe",
+                    "mixHash" : "0x0132948a6f70059b5ac0a70813551fd4c38c7aee90ac0fac9ff6725cd387d0bb",
+                    "nonce" : "0x2fe4f70e00c8e3ce",
                     "number" : "0x01",
-                    "parentHash" : "35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
-                    "receiptTrie" : "502c34a7fe54566fd854ae512f61a0026a2ef3cc5c653762eaacc6bfc602cd0e",
-                    "stateRoot" : "18c6d014ec68350861feb79b297686aa734a9b2ef0ac1fc756e0f2fec210bc30",
+                    "parentHash" : "0x35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
+                    "receiptTrie" : "0x502c34a7fe54566fd854ae512f61a0026a2ef3cc5c653762eaacc6bfc602cd0e",
+                    "stateRoot" : "0x18c6d014ec68350861feb79b297686aa734a9b2ef0ac1fc756e0f2fec210bc30",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a035d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018c6d014ec68350861feb79b297686aa734a9b2ef0ac1fc756e0f2fec210bc30a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0502c34a7fe54566fd854ae512f61a0026a2ef3cc5c653762eaacc6bfc602cd0eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a0f910b03720c1356823a9d9f0af32d7302049a8e2095d53dbba03f9cffb5410518833847afef4d9dca5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a035d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018c6d014ec68350861feb79b297686aa734a9b2ef0ac1fc756e0f2fec210bc30a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0502c34a7fe54566fd854ae512f61a0026a2ef3cc5c653762eaacc6bfc602cd0eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a00132948a6f70059b5ac0a70813551fd4c38c7aee90ac0fac9ff6725cd387d0bb882fe4f70e00c8e3cef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -315,28 +330,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "d2f1b5b3faed93a50f8efe19bbc40d0f6564d8dcf0b0990d6b3a075c7028def1",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd2f1b5b3faed93a50f8efe19bbc40d0f6564d8dcf0b0990d6b3a075c7028def1",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2f1b5b3faed93a50f8efe19bbc40d0f6564d8dcf0b0990d6b3a075c7028def1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "35b5f38a7f9a8314cecd9a369f8f06b8486649b96c506ee998ffc40b5140f3e3",
+        "lastblockhash" : "0x6433ba8e49fa6c2ffa13a6f5356fb6eeb7ee5cc0706a9185b75bb336bcf0dabe",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -345,14 +360,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
@@ -367,46 +382,46 @@
                     "0xf0" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f79455",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7606bab",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -414,36 +429,41 @@
         }
     },
     "callcodecall_10_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecall_10_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x039455",
-                    "hash" : "7a39ee2bdea589968647f25503f5dd13aab8f1dc3366bd8de277e3dbc283a798",
-                    "mixHash" : "2707b690a37ea91fa74796453d4c1d88c8212e6695c18783731e8987e111a8d5",
-                    "nonce" : "454533e6016c65f7",
+                    "hash" : "0xc837ce4c6659eb1b7b25dec92080a0bf1eda513def145b4ea9081b5b82802667",
+                    "mixHash" : "0x2bb21a58bc977215a537b9d38877a7ba4d3dca457f75c335609fabeeb9a8d0a2",
+                    "nonce" : "0x6b5d686a4393e2e2",
                     "number" : "0x01",
-                    "parentHash" : "35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
-                    "receiptTrie" : "502c34a7fe54566fd854ae512f61a0026a2ef3cc5c653762eaacc6bfc602cd0e",
-                    "stateRoot" : "18c6d014ec68350861feb79b297686aa734a9b2ef0ac1fc756e0f2fec210bc30",
+                    "parentHash" : "0x35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
+                    "receiptTrie" : "0x502c34a7fe54566fd854ae512f61a0026a2ef3cc5c653762eaacc6bfc602cd0e",
+                    "stateRoot" : "0x18c6d014ec68350861feb79b297686aa734a9b2ef0ac1fc756e0f2fec210bc30",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a035d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018c6d014ec68350861feb79b297686aa734a9b2ef0ac1fc756e0f2fec210bc30a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0502c34a7fe54566fd854ae512f61a0026a2ef3cc5c653762eaacc6bfc602cd0eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a02707b690a37ea91fa74796453d4c1d88c8212e6695c18783731e8987e111a8d588454533e6016c65f7f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a035d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018c6d014ec68350861feb79b297686aa734a9b2ef0ac1fc756e0f2fec210bc30a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0502c34a7fe54566fd854ae512f61a0026a2ef3cc5c653762eaacc6bfc602cd0eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a02bb21a58bc977215a537b9d38877a7ba4d3dca457f75c335609fabeeb9a8d0a2886b5d686a4393e2e2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -453,28 +473,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "d2f1b5b3faed93a50f8efe19bbc40d0f6564d8dcf0b0990d6b3a075c7028def1",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd2f1b5b3faed93a50f8efe19bbc40d0f6564d8dcf0b0990d6b3a075c7028def1",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2f1b5b3faed93a50f8efe19bbc40d0f6564d8dcf0b0990d6b3a075c7028def1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7a39ee2bdea589968647f25503f5dd13aab8f1dc3366bd8de277e3dbc283a798",
+        "lastblockhash" : "0xc837ce4c6659eb1b7b25dec92080a0bf1eda513def145b4ea9081b5b82802667",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -483,14 +503,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
@@ -505,46 +525,196 @@
                     "0xf0" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f79455",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7606bab",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecall_10_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x03997d",
+                    "hash" : "0xf8e6da08397ee4e8c5ae20364d7e2c540614bf3a2efc1e566f87ce6873a86f1f",
+                    "mixHash" : "0x6c94666545324ccd65aa39b9efe9abba310e26b409b67aa2c4f4b3a96e1836c2",
+                    "nonce" : "0xd114c345f11111f3",
+                    "number" : "0x01",
+                    "parentHash" : "0x35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
+                    "receiptTrie" : "0x607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03beb",
+                    "stateRoot" : "0x35dbb90de94ebfa49c657a8837755714d1ad73d2e2337378e20a8ceaf3cd7b32",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a035d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035dbb90de94ebfa49c657a8837755714d1ad73d2e2337378e20a8ceaf3cd7b32a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03bebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a06c94666545324ccd65aa39b9efe9abba310e26b409b67aa2c4f4b3a96e1836c288d114c345f11111f3f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xf8e6da08397ee4e8c5ae20364d7e2c540614bf3a2efc1e566f87ce6873a86f1f",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE_d0g0v0.json
index c28e16893..529fa5a89 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcall_100_OOGE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "acdc2eb4a9f86036bd26285a7909ffc13ae3e76381b1af880da3f0e83f33e5e0",
-                    "mixHash" : "f40526fd7a9d94344e4b74241c58cada5f3f1c0f9f3e7baf7577c189386bdd75",
-                    "nonce" : "2a1da061bfdf3230",
+                    "hash" : "0xe3008a15a57f11abcb9bc29c4240a5d2a7ed01ab5248d9c344b059ac94233ee3",
+                    "mixHash" : "0x57f8774734054bf8a8f70cd1b6c96ac652f6f27753db017c153f79ff4dc668d2",
+                    "nonce" : "0x54509aa57875524f",
                     "number" : "0x01",
-                    "parentHash" : "c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
-                    "receiptTrie" : "9a2822b03b8d31de8c28d3dc2e00a6864e75901a5d833bf458c200471eed079e",
-                    "stateRoot" : "51d7f4e247c241fd5547cf58d342a0a137a03b0c61027615be86f81233efd91c",
+                    "parentHash" : "0xc389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
+                    "receiptTrie" : "0x9a2822b03b8d31de8c28d3dc2e00a6864e75901a5d833bf458c200471eed079e",
+                    "stateRoot" : "0x51d7f4e247c241fd5547cf58d342a0a137a03b0c61027615be86f81233efd91c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051d7f4e247c241fd5547cf58d342a0a137a03b0c61027615be86f81233efd91ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09a2822b03b8d31de8c28d3dc2e00a6864e75901a5d833bf458c200471eed079eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0f40526fd7a9d94344e4b74241c58cada5f3f1c0f9f3e7baf7577c189386bdd75882a1da061bfdf3230f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051d7f4e247c241fd5547cf58d342a0a137a03b0c61027615be86f81233efd91ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09a2822b03b8d31de8c28d3dc2e00a6864e75901a5d833bf458c200471eed079eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a057f8774734054bf8a8f70cd1b6c96ac652f6f27753db017c153f79ff4dc668d28854509aa57875524ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "2f5b47330d0078c4078d62170af26853c3e546f744d48565cbc1fb7e7ac1fe62",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2f5b47330d0078c4078d62170af26853c3e546f744d48565cbc1fb7e7ac1fe62",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f5b47330d0078c4078d62170af26853c3e546f744d48565cbc1fb7e7ac1fe62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "acdc2eb4a9f86036bd26285a7909ffc13ae3e76381b1af880da3f0e83f33e5e0",
+        "lastblockhash" : "0xe3008a15a57f11abcb9bc29c4240a5d2a7ed01ab5248d9c344b059ac94233ee3",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -69,74 +74,74 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55892",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762a76e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -144,36 +149,41 @@
         }
     },
     "callcodecallcall_100_OOGE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "0842f6722990ee79290d60bcf320502872853c6352827cfe79aa02aa70d878d0",
-                    "mixHash" : "dd4423da6563750c0e9ca2cc32862ea90fa7d4b4fa935bcae97ff544d7eb4a35",
-                    "nonce" : "2cdbd2c26cf75c24",
+                    "hash" : "0xc18f5e523e8c2d1b46748f27bf48f73abad011d104d10ebd61d317b686419770",
+                    "mixHash" : "0x46c7d200efe2f9d72efaa7e79e4d00ab8c63963b7c0867b6ae65ba47105dcadc",
+                    "nonce" : "0xef36a184fc383d92",
                     "number" : "0x01",
-                    "parentHash" : "c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
-                    "receiptTrie" : "9a2822b03b8d31de8c28d3dc2e00a6864e75901a5d833bf458c200471eed079e",
-                    "stateRoot" : "51d7f4e247c241fd5547cf58d342a0a137a03b0c61027615be86f81233efd91c",
+                    "parentHash" : "0xc389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
+                    "receiptTrie" : "0x9a2822b03b8d31de8c28d3dc2e00a6864e75901a5d833bf458c200471eed079e",
+                    "stateRoot" : "0x51d7f4e247c241fd5547cf58d342a0a137a03b0c61027615be86f81233efd91c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051d7f4e247c241fd5547cf58d342a0a137a03b0c61027615be86f81233efd91ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09a2822b03b8d31de8c28d3dc2e00a6864e75901a5d833bf458c200471eed079eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0dd4423da6563750c0e9ca2cc32862ea90fa7d4b4fa935bcae97ff544d7eb4a35882cdbd2c26cf75c24f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051d7f4e247c241fd5547cf58d342a0a137a03b0c61027615be86f81233efd91ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09a2822b03b8d31de8c28d3dc2e00a6864e75901a5d833bf458c200471eed079eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a046c7d200efe2f9d72efaa7e79e4d00ab8c63963b7c0867b6ae65ba47105dcadc88ef36a184fc383d92f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -183,28 +193,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "2f5b47330d0078c4078d62170af26853c3e546f744d48565cbc1fb7e7ac1fe62",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2f5b47330d0078c4078d62170af26853c3e546f744d48565cbc1fb7e7ac1fe62",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f5b47330d0078c4078d62170af26853c3e546f744d48565cbc1fb7e7ac1fe62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0842f6722990ee79290d60bcf320502872853c6352827cfe79aa02aa70d878d0",
+        "lastblockhash" : "0xc18f5e523e8c2d1b46748f27bf48f73abad011d104d10ebd61d317b686419770",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -213,74 +223,74 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55892",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762a76e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -288,36 +298,41 @@
         }
     },
     "callcodecallcall_100_OOGE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "0494240295f52c44df1a4a326a1937570bb9e0ac6b70d39a36feb4eb51ca5196",
-                    "mixHash" : "eb6e0aa6ccbafde488e3c855a01f4b3e908ffb9c2f20cadf4f11b8c8121e36ad",
-                    "nonce" : "07c57f81a47236e1",
+                    "hash" : "0xf00bceb0460e83ed499e54336d4ddde5446ad2fc4c884cfa313f27d4fed91558",
+                    "mixHash" : "0x6b74e586279453609ef92e00ee88cdaccf668ca4a3ad0e6273f4049c9c094b72",
+                    "nonce" : "0x985ad85a2b41ba9a",
                     "number" : "0x01",
-                    "parentHash" : "c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
-                    "receiptTrie" : "aa22f1d4290b29a46d206ae5e49b7ca050800a258d191191ce27c3bfa4c7b163",
-                    "stateRoot" : "bd3023c88ed1b268652b0d20bfa6cd26748a86526564d0ff1bc5e0becb24f006",
+                    "parentHash" : "0xc389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
+                    "receiptTrie" : "0xaa22f1d4290b29a46d206ae5e49b7ca050800a258d191191ce27c3bfa4c7b163",
+                    "stateRoot" : "0xbd3023c88ed1b268652b0d20bfa6cd26748a86526564d0ff1bc5e0becb24f006",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd3023c88ed1b268652b0d20bfa6cd26748a86526564d0ff1bc5e0becb24f006a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0aa22f1d4290b29a46d206ae5e49b7ca050800a258d191191ce27c3bfa4c7b163b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0eb6e0aa6ccbafde488e3c855a01f4b3e908ffb9c2f20cadf4f11b8c8121e36ad8807c57f81a47236e1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd3023c88ed1b268652b0d20bfa6cd26748a86526564d0ff1bc5e0becb24f006a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0aa22f1d4290b29a46d206ae5e49b7ca050800a258d191191ce27c3bfa4c7b163b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a06b74e586279453609ef92e00ee88cdaccf668ca4a3ad0e6273f4049c9c094b7288985ad85a2b41ba9af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -327,28 +342,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "2f5b47330d0078c4078d62170af26853c3e546f744d48565cbc1fb7e7ac1fe62",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2f5b47330d0078c4078d62170af26853c3e546f744d48565cbc1fb7e7ac1fe62",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f5b47330d0078c4078d62170af26853c3e546f744d48565cbc1fb7e7ac1fe62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0494240295f52c44df1a4a326a1937570bb9e0ac6b70d39a36feb4eb51ca5196",
+        "lastblockhash" : "0xf00bceb0460e83ed499e54336d4ddde5446ad2fc4c884cfa313f27d4fed91558",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -357,74 +372,74 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550d6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af2a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -432,36 +447,41 @@
         }
     },
     "callcodecallcall_100_OOGE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "679252c06dfc2408430dd0499fe1723347a50b22f4d2681101b9a9addff8f12d",
-                    "mixHash" : "5bfb79bcba331b09997b67621e07990bc93e3d75111dfdd25eb2f2415b56991a",
-                    "nonce" : "e74d393c756d0324",
+                    "hash" : "0xb9e6ae392bd7feb87835c55ce4425cbf9e5b7cbda1f88df2cdb0bde8c39b8654",
+                    "mixHash" : "0x7b4297d15a7a7557d21925cb2e5ce5f5ca26f05cf485517c82633c7ba3333ac3",
+                    "nonce" : "0x0142c0e66280fe79",
                     "number" : "0x01",
-                    "parentHash" : "c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
-                    "receiptTrie" : "aa22f1d4290b29a46d206ae5e49b7ca050800a258d191191ce27c3bfa4c7b163",
-                    "stateRoot" : "bd3023c88ed1b268652b0d20bfa6cd26748a86526564d0ff1bc5e0becb24f006",
+                    "parentHash" : "0xc389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
+                    "receiptTrie" : "0xaa22f1d4290b29a46d206ae5e49b7ca050800a258d191191ce27c3bfa4c7b163",
+                    "stateRoot" : "0xbd3023c88ed1b268652b0d20bfa6cd26748a86526564d0ff1bc5e0becb24f006",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd3023c88ed1b268652b0d20bfa6cd26748a86526564d0ff1bc5e0becb24f006a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0aa22f1d4290b29a46d206ae5e49b7ca050800a258d191191ce27c3bfa4c7b163b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a05bfb79bcba331b09997b67621e07990bc93e3d75111dfdd25eb2f2415b56991a88e74d393c756d0324f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd3023c88ed1b268652b0d20bfa6cd26748a86526564d0ff1bc5e0becb24f006a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0aa22f1d4290b29a46d206ae5e49b7ca050800a258d191191ce27c3bfa4c7b163b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a07b4297d15a7a7557d21925cb2e5ce5f5ca26f05cf485517c82633c7ba3333ac3880142c0e66280fe79f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -471,28 +491,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "2f5b47330d0078c4078d62170af26853c3e546f744d48565cbc1fb7e7ac1fe62",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2f5b47330d0078c4078d62170af26853c3e546f744d48565cbc1fb7e7ac1fe62",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f5b47330d0078c4078d62170af26853c3e546f744d48565cbc1fb7e7ac1fe62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "679252c06dfc2408430dd0499fe1723347a50b22f4d2681101b9a9addff8f12d",
+        "lastblockhash" : "0xb9e6ae392bd7feb87835c55ce4425cbf9e5b7cbda1f88df2cdb0bde8c39b8654",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -501,74 +521,230 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550d6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af2a",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x94b5b2bf4aded96ea54d9e1f73ccee8b174cc0b131682c54f8446f7d32777eb7",
+                    "mixHash" : "0xa4834109bc966e1d4e3f996eaa72c2ef0e32224184c8c70aa37e3e2b7f38ca84",
+                    "nonce" : "0xff11a11cd41a4e8a",
+                    "number" : "0x01",
+                    "parentHash" : "0xc389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0x2cf1a27c9b51087d0a608719935d2ae1cac260b1536012aaab9554bd733f7d3b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02cf1a27c9b51087d0a608719935d2ae1cac260b1536012aaab9554bd733f7d3ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0a4834109bc966e1d4e3f996eaa72c2ef0e32224184c8c70aa37e3e2b7f38ca8488ff11a11cd41a4e8af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0x94b5b2bf4aded96ea54d9e1f73ccee8b174cc0b131682c54f8446f7d32777eb7",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter_d0g0v0.json
index 9d6c03a0a..3ccc575a9 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcall_100_OOGMAfter_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "916ceedbba5148a0cfadd1984f24c73951e65bc3b49bf40c760318b23aac3c22",
-                    "mixHash" : "b56ab324eff8cae4f233a967abcec7ee47859f25c0a795851edf694afc79fec9",
-                    "nonce" : "504d5188efa477dc",
+                    "hash" : "0xfde5457b34eb904dcbcc0508a3474c39b3aea3c470e6c5b8a47d886f137254d4",
+                    "mixHash" : "0x287b54eb336d7a4ca5fc726522b36076bd1d7bfc05389dff50f97c4b006d614f",
+                    "nonce" : "0x2231b8b1d375cb6e",
                     "number" : "0x01",
-                    "parentHash" : "461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
-                    "receiptTrie" : "43c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05",
-                    "stateRoot" : "40d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18",
+                    "parentHash" : "0x461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
+                    "receiptTrie" : "0x43c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05",
+                    "stateRoot" : "0x40d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea043c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0b56ab324eff8cae4f233a967abcec7ee47859f25c0a795851edf694afc79fec988504d5188efa477dcf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea043c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0287b54eb336d7a4ca5fc726522b36076bd1d7bfc05389dff50f97c4b006d614f882231b8b1d375cb6ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "916ceedbba5148a0cfadd1984f24c73951e65bc3b49bf40c760318b23aac3c22",
+        "lastblockhash" : "0xfde5457b34eb904dcbcc0508a3474c39b3aea3c470e6c5b8a47d886f137254d4",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcodecallcall_100_OOGMAfter_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "b1ac1d1cb1a5df94c752f027e3d2d33904b1a724e9cba7f2430696d29a5128ba",
-                    "mixHash" : "11a019b7743e2869a6afc7ce6e0b45dd82685e7531a098a38329d123d55f6c53",
-                    "nonce" : "63268f2584b10362",
+                    "hash" : "0xa9cf954db772834ae611e5c4fd7bc290f30e0099050d6e6df7db77ca7c4c780f",
+                    "mixHash" : "0x3125da4079c03f2110243d483322261239ae405ecfdcb80c19c8200c90fc6260",
+                    "nonce" : "0x2e7c628cde01be40",
                     "number" : "0x01",
-                    "parentHash" : "461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
-                    "receiptTrie" : "43c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05",
-                    "stateRoot" : "40d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18",
+                    "parentHash" : "0x461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
+                    "receiptTrie" : "0x43c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05",
+                    "stateRoot" : "0x40d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea043c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a011a019b7743e2869a6afc7ce6e0b45dd82685e7531a098a38329d123d55f6c538863268f2584b10362f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea043c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a03125da4079c03f2110243d483322261239ae405ecfdcb80c19c8200c90fc6260882e7c628cde01be40f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b1ac1d1cb1a5df94c752f027e3d2d33904b1a724e9cba7f2430696d29a5128ba",
+        "lastblockhash" : "0xa9cf954db772834ae611e5c4fd7bc290f30e0099050d6e6df7db77ca7c4c780f",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcodecallcall_100_OOGMAfter_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "c64748d08203b464c5e5fb49290c2294d133356e8f13eaa83d13e699d040b0f1",
-                    "mixHash" : "62e0515650cda07e3c7ad0b51028cec55a71bcc5aca14179d2dfc848a19ccd7b",
-                    "nonce" : "3db0d3eabc4c63ad",
+                    "hash" : "0xea09dbdf3d69b3acdf7bb0828df06b3d5d381c3780df0cea064225821063e745",
+                    "mixHash" : "0xc1e283eb02d0d9aa20a2ac518f72abdd6b59de00340610e6f151f371d0ed1b62",
+                    "nonce" : "0x3d54ec0e447a9367",
                     "number" : "0x01",
-                    "parentHash" : "461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
-                    "receiptTrie" : "31a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6",
-                    "stateRoot" : "e9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020e",
+                    "parentHash" : "0x461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
+                    "receiptTrie" : "0x31a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6",
+                    "stateRoot" : "0xe9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea031a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a062e0515650cda07e3c7ad0b51028cec55a71bcc5aca14179d2dfc848a19ccd7b883db0d3eabc4c63adf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea031a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0c1e283eb02d0d9aa20a2ac518f72abdd6b59de00340610e6f151f371d0ed1b62883d54ec0e447a9367f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c64748d08203b464c5e5fb49290c2294d133356e8f13eaa83d13e699d040b0f1",
+        "lastblockhash" : "0xea09dbdf3d69b3acdf7bb0828df06b3d5d381c3780df0cea064225821063e745",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcodecallcall_100_OOGMAfter_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "c8b48ab4079060d83447d6f36a87bfb5ff1a976610d756dda5c55c79ccd46a74",
-                    "mixHash" : "e3b01db945f91198ec87a6d6343157dd580a07b9279ed97828db2af550095c14",
-                    "nonce" : "fdd162c92c66f9d8",
+                    "hash" : "0x1a38e6b6a3a663104ed0ad8d2ffb7d37eeebd638b29d92103c40b6a3a50ddb80",
+                    "mixHash" : "0x8664291cac8b621170f16f64feb8ddec3c30d65ef7a28ee49473dc26fb93b793",
+                    "nonce" : "0x5d6c901a41d51f91",
                     "number" : "0x01",
-                    "parentHash" : "461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
-                    "receiptTrie" : "31a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6",
-                    "stateRoot" : "e9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020e",
+                    "parentHash" : "0x461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
+                    "receiptTrie" : "0x31a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6",
+                    "stateRoot" : "0xe9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea031a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0e3b01db945f91198ec87a6d6343157dd580a07b9279ed97828db2af550095c1488fdd162c92c66f9d8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea031a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a08664291cac8b621170f16f64feb8ddec3c30d65ef7a28ee49473dc26fb93b793885d6c901a41d51f91f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c8b48ab4079060d83447d6f36a87bfb5ff1a976610d756dda5c55c79ccd46a74",
+        "lastblockhash" : "0x1a38e6b6a3a663104ed0ad8d2ffb7d37eeebd638b29d92103c40b6a3a50ddb80",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xe1c58ac00edb7648f896caa859006c6509d17db366d53aeaaa30a38b6193ff6a",
+                    "mixHash" : "0x4f11f0d0e59b76a50e4bce1094a25cef0df3eff82c6b5ba37afce2bdfbe46219",
+                    "nonce" : "0xc33f085785344dfc",
+                    "number" : "0x01",
+                    "parentHash" : "0x461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0xb6e7fffb6aa56ee0988357a7b2e2679bb92808eba6809af8ecfe5e5d7ce9ee41",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6e7fffb6aa56ee0988357a7b2e2679bb92808eba6809af8ecfe5e5d7ce9ee41a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a04f11f0d0e59b76a50e4bce1094a25cef0df3eff82c6b5ba37afce2bdfbe4621988c33f085785344dfcf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0xe1c58ac00edb7648f896caa859006c6509d17db366d53aeaaa30a38b6193ff6a",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore_d0g0v0.json
index 84b2963af..5c0001194 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcall_100_OOGMBefore_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "a2c2d537a6a45eff37f79ac9e4b5c5defc7e152313ad9d75107d7a9112b52cc0",
-                    "mixHash" : "8c3eb83ba5406972f7729b148e0a7100b406d3d666b17ebbb6c79b9b37b12fd2",
-                    "nonce" : "2484695ff6a2c69b",
+                    "hash" : "0x6da7f7e632007b86fb4f6ac84cb5fc4d5c6dae33c6a6949460b4dc79c30504fc",
+                    "mixHash" : "0x33ae43955428d1ddb750e34fb1b3b6e6ec9728375184a0e506d8afa2d0962127",
+                    "nonce" : "0x3d3ff4c94b7003eb",
                     "number" : "0x01",
-                    "parentHash" : "478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
-                    "receiptTrie" : "04d281102f9782f1d75245d66aa227fc3fd8e7e0fccb6591a4b4b119bae6c976",
-                    "stateRoot" : "4268cf8486d56af3f1c1a110a0c643ef1442a1a85943397640035ddad8b8c5a6",
+                    "parentHash" : "0x478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
+                    "receiptTrie" : "0x04d281102f9782f1d75245d66aa227fc3fd8e7e0fccb6591a4b4b119bae6c976",
+                    "stateRoot" : "0x4268cf8486d56af3f1c1a110a0c643ef1442a1a85943397640035ddad8b8c5a6",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04268cf8486d56af3f1c1a110a0c643ef1442a1a85943397640035ddad8b8c5a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004d281102f9782f1d75245d66aa227fc3fd8e7e0fccb6591a4b4b119bae6c976b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a08c3eb83ba5406972f7729b148e0a7100b406d3d666b17ebbb6c79b9b37b12fd2882484695ff6a2c69bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04268cf8486d56af3f1c1a110a0c643ef1442a1a85943397640035ddad8b8c5a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004d281102f9782f1d75245d66aa227fc3fd8e7e0fccb6591a4b4b119bae6c976b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a033ae43955428d1ddb750e34fb1b3b6e6ec9728375184a0e506d8afa2d0962127883d3ff4c94b7003ebf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4dbb9105b69cef47a97dca13b996accfad10f77bb42352666539ac282b2e8dd4",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4dbb9105b69cef47a97dca13b996accfad10f77bb42352666539ac282b2e8dd4",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dbb9105b69cef47a97dca13b996accfad10f77bb42352666539ac282b2e8dd4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a2c2d537a6a45eff37f79ac9e4b5c5defc7e152313ad9d75107d7a9112b52cc0",
+        "lastblockhash" : "0x6da7f7e632007b86fb4f6ac84cb5fc4d5c6dae33c6a6949460b4dc79c30504fc",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa0c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcodecallcall_100_OOGMBefore_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "f0bc8efaa74c79f87345255283897ca74bad942f162a838aa76f994432b2e489",
-                    "mixHash" : "fd289756815966337dd7ade5e009278bdcf1b7770cb467818e3a8ac174a6c484",
-                    "nonce" : "d8598ce1c5ad7a00",
+                    "hash" : "0xc9127e3297241b75dfbc6590d97045aa9d63aa1749a2046f38bd9bee288eeade",
+                    "mixHash" : "0x8ccfb7d7ab65b0c673e9970cb86d2828440f46ec5c7abdc86e29cc4fbb6ec67e",
+                    "nonce" : "0xa09ac2552d51fae0",
                     "number" : "0x01",
-                    "parentHash" : "478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
-                    "receiptTrie" : "04d281102f9782f1d75245d66aa227fc3fd8e7e0fccb6591a4b4b119bae6c976",
-                    "stateRoot" : "4268cf8486d56af3f1c1a110a0c643ef1442a1a85943397640035ddad8b8c5a6",
+                    "parentHash" : "0x478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
+                    "receiptTrie" : "0x04d281102f9782f1d75245d66aa227fc3fd8e7e0fccb6591a4b4b119bae6c976",
+                    "stateRoot" : "0x4268cf8486d56af3f1c1a110a0c643ef1442a1a85943397640035ddad8b8c5a6",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04268cf8486d56af3f1c1a110a0c643ef1442a1a85943397640035ddad8b8c5a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004d281102f9782f1d75245d66aa227fc3fd8e7e0fccb6591a4b4b119bae6c976b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0fd289756815966337dd7ade5e009278bdcf1b7770cb467818e3a8ac174a6c48488d8598ce1c5ad7a00f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04268cf8486d56af3f1c1a110a0c643ef1442a1a85943397640035ddad8b8c5a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004d281102f9782f1d75245d66aa227fc3fd8e7e0fccb6591a4b4b119bae6c976b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a08ccfb7d7ab65b0c673e9970cb86d2828440f46ec5c7abdc86e29cc4fbb6ec67e88a09ac2552d51fae0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4dbb9105b69cef47a97dca13b996accfad10f77bb42352666539ac282b2e8dd4",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4dbb9105b69cef47a97dca13b996accfad10f77bb42352666539ac282b2e8dd4",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dbb9105b69cef47a97dca13b996accfad10f77bb42352666539ac282b2e8dd4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f0bc8efaa74c79f87345255283897ca74bad942f162a838aa76f994432b2e489",
+        "lastblockhash" : "0xc9127e3297241b75dfbc6590d97045aa9d63aa1749a2046f38bd9bee288eeade",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa0c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcodecallcall_100_OOGMBefore_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "520a8eb942d704eb1153c47740416269bd77f8500779c032326b957c9d950f9e",
-                    "mixHash" : "d9f043d51a6139b77f60addea4bc42d100b8f7050530808a2171988ce1662577",
-                    "nonce" : "2f106c79ae9f4a28",
+                    "hash" : "0x8a5a0f3af5e7d3e86bdf9cb35c946dd808cbe1999ed36a242040da408dffacb8",
+                    "mixHash" : "0xb9f8cf6c52d93986e2adfcba3043af94b6d17d9a90d4932fc9ebae29f009bf64",
+                    "nonce" : "0x4a2c97a78ed32c1f",
                     "number" : "0x01",
-                    "parentHash" : "478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
-                    "receiptTrie" : "b94b6d202eaf3f503c7fdf021b5db849843fa88457c43d394512ebb2f92be6bd",
-                    "stateRoot" : "f03ddbedeb973b0e91c0317ad41c843c21491ebfce4608e6ce9e0218026ee3f5",
+                    "parentHash" : "0x478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
+                    "receiptTrie" : "0xb94b6d202eaf3f503c7fdf021b5db849843fa88457c43d394512ebb2f92be6bd",
+                    "stateRoot" : "0xf03ddbedeb973b0e91c0317ad41c843c21491ebfce4608e6ce9e0218026ee3f5",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f03ddbedeb973b0e91c0317ad41c843c21491ebfce4608e6ce9e0218026ee3f5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b94b6d202eaf3f503c7fdf021b5db849843fa88457c43d394512ebb2f92be6bdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0d9f043d51a6139b77f60addea4bc42d100b8f7050530808a2171988ce1662577882f106c79ae9f4a28f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f03ddbedeb973b0e91c0317ad41c843c21491ebfce4608e6ce9e0218026ee3f5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b94b6d202eaf3f503c7fdf021b5db849843fa88457c43d394512ebb2f92be6bdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0b9f8cf6c52d93986e2adfcba3043af94b6d17d9a90d4932fc9ebae29f009bf64884a2c97a78ed32c1ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,28 +340,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4dbb9105b69cef47a97dca13b996accfad10f77bb42352666539ac282b2e8dd4",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4dbb9105b69cef47a97dca13b996accfad10f77bb42352666539ac282b2e8dd4",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dbb9105b69cef47a97dca13b996accfad10f77bb42352666539ac282b2e8dd4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "520a8eb942d704eb1153c47740416269bd77f8500779c032326b957c9d950f9e",
+        "lastblockhash" : "0x8a5a0f3af5e7d3e86bdf9cb35c946dd808cbe1999ed36a242040da408dffacb8",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -354,74 +369,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -429,36 +444,41 @@
         }
     },
     "callcodecallcall_100_OOGMBefore_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "763db21ec9bd7bdadb93ae1bcd0d22117f05f4ede542a4b94778a8a8ebf55e50",
-                    "mixHash" : "df671d72a9be81c37e45f25056bacbda041da50e2f21656cca0743ae97e187c5",
-                    "nonce" : "30534da936d2d658",
+                    "hash" : "0x0ad6079a02ac9292401e19a2b86d53ea3d763ceb81742abddf34071bb89dd5bd",
+                    "mixHash" : "0x1f5b4d8f8f4decc40367824b4d690de6b86aa10eeea19285c31a8590a80b9fd0",
+                    "nonce" : "0x3bf674a81b619f1b",
                     "number" : "0x01",
-                    "parentHash" : "478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
-                    "receiptTrie" : "b94b6d202eaf3f503c7fdf021b5db849843fa88457c43d394512ebb2f92be6bd",
-                    "stateRoot" : "f03ddbedeb973b0e91c0317ad41c843c21491ebfce4608e6ce9e0218026ee3f5",
+                    "parentHash" : "0x478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
+                    "receiptTrie" : "0xb94b6d202eaf3f503c7fdf021b5db849843fa88457c43d394512ebb2f92be6bd",
+                    "stateRoot" : "0xf03ddbedeb973b0e91c0317ad41c843c21491ebfce4608e6ce9e0218026ee3f5",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f03ddbedeb973b0e91c0317ad41c843c21491ebfce4608e6ce9e0218026ee3f5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b94b6d202eaf3f503c7fdf021b5db849843fa88457c43d394512ebb2f92be6bdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0df671d72a9be81c37e45f25056bacbda041da50e2f21656cca0743ae97e187c58830534da936d2d658f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f03ddbedeb973b0e91c0317ad41c843c21491ebfce4608e6ce9e0218026ee3f5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b94b6d202eaf3f503c7fdf021b5db849843fa88457c43d394512ebb2f92be6bdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a01f5b4d8f8f4decc40367824b4d690de6b86aa10eeea19285c31a8590a80b9fd0883bf674a81b619f1bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -468,28 +488,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4dbb9105b69cef47a97dca13b996accfad10f77bb42352666539ac282b2e8dd4",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4dbb9105b69cef47a97dca13b996accfad10f77bb42352666539ac282b2e8dd4",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dbb9105b69cef47a97dca13b996accfad10f77bb42352666539ac282b2e8dd4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "763db21ec9bd7bdadb93ae1bcd0d22117f05f4ede542a4b94778a8a8ebf55e50",
+        "lastblockhash" : "0x0ad6079a02ac9292401e19a2b86d53ea3d763ceb81742abddf34071bb89dd5bd",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -497,74 +517,229 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x47d14c3ac894c7fb11238f434e4ff8c656ba8f2295264149e70003798057b9a0",
+                    "mixHash" : "0x57210568106f301d114b60d9a294b26870dfb187d4ed1a247481293d7ab15817",
+                    "nonce" : "0x911df768344b446b",
+                    "number" : "0x01",
+                    "parentHash" : "0x478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0xc01b13bb3b5d2f0139b9897eb6719a0e8bde4be9fe5ec7bb706e2aa2b5a17d6d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c01b13bb3b5d2f0139b9897eb6719a0e8bde4be9fe5ec7bb706e2aa2b5a17d6da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a057210568106f301d114b60d9a294b26870dfb187d4ed1a247481293d7ab1581788911df768344b446bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0x47d14c3ac894c7fb11238f434e4ff8c656ba8f2295264149e70003798057b9a0",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd_d0g0v0.json
index 4cf790b14..5c8feb1d4 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcall_100_SuicideEnd_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "af42239326b6d7032674c38c729abf1e40050d08ca663f2db93a96d988160a9d",
-                    "mixHash" : "677cf6602b3a62c44c5a0e125ede31ed69a7a8e8e9319a3ecf5a40353a4fa35e",
-                    "nonce" : "96c4ffb21e06104f",
+                    "hash" : "0x53ac25adb36b22071e95322ec6f50e7976f29124af3b77fae6f28c492dfdbcfb",
+                    "mixHash" : "0x3098f660e97e1dc776fbff89857e1b08fd2ddffed788d796e3b1bb301d573a8f",
+                    "nonce" : "0xb2fb2e1769769e6b",
                     "number" : "0x01",
-                    "parentHash" : "a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
-                    "receiptTrie" : "ad88e4108cf072babefa51eb0abbd8c3a15dd0bf0d76ed8efef7c556f7881dda",
-                    "stateRoot" : "a0d8779e3fbc2e2886e53003a999092383a92a930604316a2aa2aa61cc3c6e9c",
+                    "parentHash" : "0xa8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
+                    "receiptTrie" : "0xad88e4108cf072babefa51eb0abbd8c3a15dd0bf0d76ed8efef7c556f7881dda",
+                    "stateRoot" : "0xa0d8779e3fbc2e2886e53003a999092383a92a930604316a2aa2aa61cc3c6e9c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0d8779e3fbc2e2886e53003a999092383a92a930604316a2aa2aa61cc3c6e9ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ad88e4108cf072babefa51eb0abbd8c3a15dd0bf0d76ed8efef7c556f7881ddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0677cf6602b3a62c44c5a0e125ede31ed69a7a8e8e9319a3ecf5a40353a4fa35e8896c4ffb21e06104ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0d8779e3fbc2e2886e53003a999092383a92a930604316a2aa2aa61cc3c6e9ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ad88e4108cf072babefa51eb0abbd8c3a15dd0bf0d76ed8efef7c556f7881ddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a03098f660e97e1dc776fbff89857e1b08fd2ddffed788d796e3b1bb301d573a8f88b2fb2e1769769e6bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "afe031270d049809c909fcbda8b9dc1bf80bee8e14504b02f6744ad3648269ed",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xafe031270d049809c909fcbda8b9dc1bf80bee8e14504b02f6744ad3648269ed",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afe031270d049809c909fcbda8b9dc1bf80bee8e14504b02f6744ad3648269eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "af42239326b6d7032674c38c729abf1e40050d08ca663f2db93a96d988160a9d",
+        "lastblockhash" : "0x53ac25adb36b22071e95322ec6f50e7976f29124af3b77fae6f28c492dfdbcfb",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -69,14 +74,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x04a817c800",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
@@ -84,53 +89,53 @@
                     "0x03" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f548e7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762b719",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -138,36 +143,41 @@
         }
     },
     "callcodecallcall_100_SuicideEnd_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "9608a051f12d44957ef9370b9652bdf3bd2494b5e227535ef5b651e2ba26066f",
-                    "mixHash" : "cce001f87a9f59e3ab0bf70acf630dc0ed0f83b05ba8aeaaee8f214438084830",
-                    "nonce" : "e5d6859898c21872",
+                    "hash" : "0x5582fb05fbc21ebea20ba8692905c3cf945ff3488a4ee4c843bb74519ad55ef6",
+                    "mixHash" : "0xdabb2aa10795b12695f7e2234e366c9b058fc6c1d874fef55c1bf74b78bfe2a2",
+                    "nonce" : "0x30d1c941e9eef2c1",
                     "number" : "0x01",
-                    "parentHash" : "a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
-                    "receiptTrie" : "ad88e4108cf072babefa51eb0abbd8c3a15dd0bf0d76ed8efef7c556f7881dda",
-                    "stateRoot" : "a0d8779e3fbc2e2886e53003a999092383a92a930604316a2aa2aa61cc3c6e9c",
+                    "parentHash" : "0xa8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
+                    "receiptTrie" : "0xad88e4108cf072babefa51eb0abbd8c3a15dd0bf0d76ed8efef7c556f7881dda",
+                    "stateRoot" : "0xa0d8779e3fbc2e2886e53003a999092383a92a930604316a2aa2aa61cc3c6e9c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0d8779e3fbc2e2886e53003a999092383a92a930604316a2aa2aa61cc3c6e9ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ad88e4108cf072babefa51eb0abbd8c3a15dd0bf0d76ed8efef7c556f7881ddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0cce001f87a9f59e3ab0bf70acf630dc0ed0f83b05ba8aeaaee8f21443808483088e5d6859898c21872f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0d8779e3fbc2e2886e53003a999092383a92a930604316a2aa2aa61cc3c6e9ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ad88e4108cf072babefa51eb0abbd8c3a15dd0bf0d76ed8efef7c556f7881ddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0dabb2aa10795b12695f7e2234e366c9b058fc6c1d874fef55c1bf74b78bfe2a28830d1c941e9eef2c1f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -177,28 +187,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "afe031270d049809c909fcbda8b9dc1bf80bee8e14504b02f6744ad3648269ed",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xafe031270d049809c909fcbda8b9dc1bf80bee8e14504b02f6744ad3648269ed",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afe031270d049809c909fcbda8b9dc1bf80bee8e14504b02f6744ad3648269eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9608a051f12d44957ef9370b9652bdf3bd2494b5e227535ef5b651e2ba26066f",
+        "lastblockhash" : "0x5582fb05fbc21ebea20ba8692905c3cf945ff3488a4ee4c843bb74519ad55ef6",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -207,14 +217,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x04a817c800",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
@@ -222,53 +232,53 @@
                     "0x03" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f548e7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762b719",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -276,36 +286,41 @@
         }
     },
     "callcodecallcall_100_SuicideEnd_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "9ef5b2dcedff267fffc421ddc36d457ea11093b643cbce32603ab435912481f2",
-                    "mixHash" : "e5eee7dad97a4faa96c8dd442737798c61c9063f5d8edc6ffad493406d8fd4bf",
-                    "nonce" : "292be27b9d58517c",
+                    "hash" : "0x91d362175b4b8ea8d3c742d608c449e4c0dd0e8a8b5107ed1449e47058e98044",
+                    "mixHash" : "0x1a8da9d4306fe47ab99971c813c0a88fd1b1fbca3a48aafb6230236d74ea53e9",
+                    "nonce" : "0x1b5cb3432cede2b9",
                     "number" : "0x01",
-                    "parentHash" : "a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
-                    "receiptTrie" : "28ca9d62fbe7fcfc0f3aadc9a50c8afe6bdb637acac09deef582d2383c11d748",
-                    "stateRoot" : "8ef2fa8714092b135f91e2b6f66281c1df243e8760889aea5285dd3be14217ac",
+                    "parentHash" : "0xa8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
+                    "receiptTrie" : "0x28ca9d62fbe7fcfc0f3aadc9a50c8afe6bdb637acac09deef582d2383c11d748",
+                    "stateRoot" : "0x8ef2fa8714092b135f91e2b6f66281c1df243e8760889aea5285dd3be14217ac",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef2fa8714092b135f91e2b6f66281c1df243e8760889aea5285dd3be14217aca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a028ca9d62fbe7fcfc0f3aadc9a50c8afe6bdb637acac09deef582d2383c11d748b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0e5eee7dad97a4faa96c8dd442737798c61c9063f5d8edc6ffad493406d8fd4bf88292be27b9d58517cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef2fa8714092b135f91e2b6f66281c1df243e8760889aea5285dd3be14217aca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a028ca9d62fbe7fcfc0f3aadc9a50c8afe6bdb637acac09deef582d2383c11d748b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a01a8da9d4306fe47ab99971c813c0a88fd1b1fbca3a48aafb6230236d74ea53e9881b5cb3432cede2b9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -315,28 +330,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "afe031270d049809c909fcbda8b9dc1bf80bee8e14504b02f6744ad3648269ed",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xafe031270d049809c909fcbda8b9dc1bf80bee8e14504b02f6744ad3648269ed",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afe031270d049809c909fcbda8b9dc1bf80bee8e14504b02f6744ad3648269eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9ef5b2dcedff267fffc421ddc36d457ea11093b643cbce32603ab435912481f2",
+        "lastblockhash" : "0x91d362175b4b8ea8d3c742d608c449e4c0dd0e8a8b5107ed1449e47058e98044",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -345,14 +360,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x04a817c800",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
@@ -360,53 +375,53 @@
                     "0x03" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52da3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762d25d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -414,36 +429,41 @@
         }
     },
     "callcodecallcall_100_SuicideEnd_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "ff0b6ffc68b5f0993f97d33a358427aac87dd81624e747fda22f24d4cd9e5c52",
-                    "mixHash" : "82029b216cf1c26d16b5591a23643d3d5817cc1145c2d5ee6b9fcb1518513863",
-                    "nonce" : "7d5cdd9c9fbf6e8e",
+                    "hash" : "0x5e5c7a3a25b8ddea664697319f45abdf9da62283b6b7c6025f51907b9885b06c",
+                    "mixHash" : "0xebf69e7e0fa8567e42d9376dbd2b69c341b097125acd9106d4fd97b6a4f5c245",
+                    "nonce" : "0xb828667aaa2e9cfa",
                     "number" : "0x01",
-                    "parentHash" : "a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
-                    "receiptTrie" : "28ca9d62fbe7fcfc0f3aadc9a50c8afe6bdb637acac09deef582d2383c11d748",
-                    "stateRoot" : "8ef2fa8714092b135f91e2b6f66281c1df243e8760889aea5285dd3be14217ac",
+                    "parentHash" : "0xa8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
+                    "receiptTrie" : "0x28ca9d62fbe7fcfc0f3aadc9a50c8afe6bdb637acac09deef582d2383c11d748",
+                    "stateRoot" : "0x8ef2fa8714092b135f91e2b6f66281c1df243e8760889aea5285dd3be14217ac",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef2fa8714092b135f91e2b6f66281c1df243e8760889aea5285dd3be14217aca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a028ca9d62fbe7fcfc0f3aadc9a50c8afe6bdb637acac09deef582d2383c11d748b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a082029b216cf1c26d16b5591a23643d3d5817cc1145c2d5ee6b9fcb1518513863887d5cdd9c9fbf6e8ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef2fa8714092b135f91e2b6f66281c1df243e8760889aea5285dd3be14217aca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a028ca9d62fbe7fcfc0f3aadc9a50c8afe6bdb637acac09deef582d2383c11d748b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0ebf69e7e0fa8567e42d9376dbd2b69c341b097125acd9106d4fd97b6a4f5c24588b828667aaa2e9cfaf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -453,28 +473,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "afe031270d049809c909fcbda8b9dc1bf80bee8e14504b02f6744ad3648269ed",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xafe031270d049809c909fcbda8b9dc1bf80bee8e14504b02f6744ad3648269ed",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afe031270d049809c909fcbda8b9dc1bf80bee8e14504b02f6744ad3648269eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ff0b6ffc68b5f0993f97d33a358427aac87dd81624e747fda22f24d4cd9e5c52",
+        "lastblockhash" : "0x5e5c7a3a25b8ddea664697319f45abdf9da62283b6b7c6025f51907b9885b06c",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -483,14 +503,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x04a817c800",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
@@ -498,53 +518,203 @@
                     "0x03" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52da3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762d25d",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x2c6236f77ed42df6c3590e3187d394cf359dd6de0ef5484086a30be62154d98c",
+                    "mixHash" : "0x316765b7395ae38d708346624f760edea37db41dcdc51ab9500de22bc831dddc",
+                    "nonce" : "0x1f9a010b66210fde",
+                    "number" : "0x01",
+                    "parentHash" : "0xa8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0x74b2bd4d783450743c013da55a61b245c897f173ef0400df9baa564d4467105b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074b2bd4d783450743c013da55a61b245c897f173ef0400df9baa564d4467105ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0316765b7395ae38d708346624f760edea37db41dcdc51ab9500de22bc831dddc881f9a010b66210fdef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x2c6236f77ed42df6c3590e3187d394cf359dd6de0ef5484086a30be62154d98c",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle_d0g0v0.json
index 56c5c9397..994fa04ca 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcall_100_SuicideMiddle_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_SuicideMiddle_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "9b54ad528259bd14ef4b9a2ecd50e330f67327ff4cb075a9a4d8efb28f2d37a2",
-                    "mixHash" : "c0eab8576f467d74f0d0d98a0632edb9f77e03a9954d4f5560383cdbb9343fc3",
-                    "nonce" : "b385e31c3476b645",
+                    "hash" : "0x81443c8f80df29aab4515a07f2ea36ecc506a8c96ce02b631cca54ab09fc0c4f",
+                    "mixHash" : "0xe7b9d33e52b764fc2eb77bb9f9632ede08f05b4dae278b97517cd0778b3aa44c",
+                    "nonce" : "0x4ef4179bf7160c84",
                     "number" : "0x01",
-                    "parentHash" : "5c9e0e34157a921b90472106047aaaeffc15f879f2ba117adddc0cff51601277",
-                    "receiptTrie" : "5b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1",
-                    "stateRoot" : "c8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71",
+                    "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+                    "receiptTrie" : "0x5b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1",
+                    "stateRoot" : "0xc8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a05c9e0e34157a921b90472106047aaaeffc15f879f2ba117adddc0cff51601277a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0c0eab8576f467d74f0d0d98a0632edb9f77e03a9954d4f5560383cdbb9343fc388b385e31c3476b645f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0e7b9d33e52b764fc2eb77bb9f9632ede08f05b4dae278b97517cd0778b3aa44c884ef4179bf7160c84f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "5c9e0e34157a921b90472106047aaaeffc15f879f2ba117adddc0cff51601277",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "95a3c33a7f0eda324fedf1fa2a4abacdc79514cfa023d409d9b2a8531965a377",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095a3c33a7f0eda324fedf1fa2a4abacdc79514cfa023d409d9b2a8531965a377a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9b54ad528259bd14ef4b9a2ecd50e330f67327ff4cb075a9a4d8efb28f2d37a2",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x81443c8f80df29aab4515a07f2ea36ecc506a8c96ce02b631cca54ab09fc0c4f",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -69,67 +74,67 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4a9c7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7635639",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -137,36 +142,41 @@
         }
     },
     "callcodecallcall_100_SuicideMiddle_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_SuicideMiddle_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "1a18f4b173ee0f8533247407d8126b4ec3e0670af3252cf380a22246bdc77197",
-                    "mixHash" : "38728727edb26cdd3898b472c0a30970200eddba00b653598b4cae0e04855678",
-                    "nonce" : "c0101b74026e456b",
+                    "hash" : "0x952389372fccf26d16054b4f3e2da449ab5235f635fb91a0b3b050190019d618",
+                    "mixHash" : "0x7775b88beff31b5840d7bd2ff84198ddf6d9cb7b6a8153fc77f7343c96947985",
+                    "nonce" : "0xa7cc7d0984bc6df5",
                     "number" : "0x01",
-                    "parentHash" : "5c9e0e34157a921b90472106047aaaeffc15f879f2ba117adddc0cff51601277",
-                    "receiptTrie" : "5b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1",
-                    "stateRoot" : "c8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71",
+                    "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+                    "receiptTrie" : "0x5b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1",
+                    "stateRoot" : "0xc8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a05c9e0e34157a921b90472106047aaaeffc15f879f2ba117adddc0cff51601277a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a038728727edb26cdd3898b472c0a30970200eddba00b653598b4cae0e0485567888c0101b74026e456bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a07775b88beff31b5840d7bd2ff84198ddf6d9cb7b6a8153fc77f7343c9694798588a7cc7d0984bc6df5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -176,28 +186,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "5c9e0e34157a921b90472106047aaaeffc15f879f2ba117adddc0cff51601277",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "95a3c33a7f0eda324fedf1fa2a4abacdc79514cfa023d409d9b2a8531965a377",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095a3c33a7f0eda324fedf1fa2a4abacdc79514cfa023d409d9b2a8531965a377a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "1a18f4b173ee0f8533247407d8126b4ec3e0670af3252cf380a22246bdc77197",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x952389372fccf26d16054b4f3e2da449ab5235f635fb91a0b3b050190019d618",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -206,67 +216,67 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4a9c7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7635639",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -274,36 +284,41 @@
         }
     },
     "callcodecallcall_100_SuicideMiddle_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_SuicideMiddle_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9117",
-                    "hash" : "cc6b7d7bd354379beaadff933203bc5123100e7562018153f603c65cfd2f157b",
-                    "mixHash" : "892ffc90c858bb0b5e93f5c8c6d085f35c3aafa6a5af25176a825672212ec4fa",
-                    "nonce" : "f703b7d156290943",
+                    "hash" : "0xcbf08db028c571f67569cae4b11af2d1cc143a5e1945190693c46b2981f1ed81",
+                    "mixHash" : "0xa87fda7982476c9f7c3dc2f43776b7315dfaf282e68650aa5ac7a17dd086b0be",
+                    "nonce" : "0xb410203a5cedda5e",
                     "number" : "0x01",
-                    "parentHash" : "5c9e0e34157a921b90472106047aaaeffc15f879f2ba117adddc0cff51601277",
-                    "receiptTrie" : "eec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6",
-                    "stateRoot" : "9803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306e",
+                    "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+                    "receiptTrie" : "0xeec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6",
+                    "stateRoot" : "0x9803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a05c9e0e34157a921b90472106047aaaeffc15f879f2ba117adddc0cff51601277a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0892ffc90c858bb0b5e93f5c8c6d085f35c3aafa6a5af25176a825672212ec4fa88f703b7d156290943f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0a87fda7982476c9f7c3dc2f43776b7315dfaf282e68650aa5ac7a17dd086b0be88b410203a5cedda5ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -313,28 +328,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "5c9e0e34157a921b90472106047aaaeffc15f879f2ba117adddc0cff51601277",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "95a3c33a7f0eda324fedf1fa2a4abacdc79514cfa023d409d9b2a8531965a377",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095a3c33a7f0eda324fedf1fa2a4abacdc79514cfa023d409d9b2a8531965a377a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "cc6b7d7bd354379beaadff933203bc5123100e7562018153f603c65cfd2f157b",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcbf08db028c571f67569cae4b11af2d1cc143a5e1945190693c46b2981f1ed81",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -343,67 +358,67 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f49117",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7636ee9",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -411,36 +426,41 @@
         }
     },
     "callcodecallcall_100_SuicideMiddle_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_SuicideMiddle_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9117",
-                    "hash" : "4a095ed68ddc82a5d673a33233fcbc639b2268765a9162b6ceef5226f1b16f30",
-                    "mixHash" : "10de7f47f133fcb34a6be4ae07536332a04f1c829fea60e3a2cad8431a7ff295",
-                    "nonce" : "e4dc83e3664fc550",
+                    "hash" : "0x552c6dc27f4ee56d86887be744dec21065caca29641df6f2c782d7cd3b87c8a0",
+                    "mixHash" : "0xd9a71eeb065dd13ef3baf60d6efd48cc1cff1f2a984d47a2995a429ac8b7a6e8",
+                    "nonce" : "0x4a8f435ae1a8b938",
                     "number" : "0x01",
-                    "parentHash" : "5c9e0e34157a921b90472106047aaaeffc15f879f2ba117adddc0cff51601277",
-                    "receiptTrie" : "eec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6",
-                    "stateRoot" : "9803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306e",
+                    "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+                    "receiptTrie" : "0xeec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6",
+                    "stateRoot" : "0x9803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a05c9e0e34157a921b90472106047aaaeffc15f879f2ba117adddc0cff51601277a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a010de7f47f133fcb34a6be4ae07536332a04f1c829fea60e3a2cad8431a7ff29588e4dc83e3664fc550f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0d9a71eeb065dd13ef3baf60d6efd48cc1cff1f2a984d47a2995a429ac8b7a6e8884a8f435ae1a8b938f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -450,28 +470,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "5c9e0e34157a921b90472106047aaaeffc15f879f2ba117adddc0cff51601277",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "95a3c33a7f0eda324fedf1fa2a4abacdc79514cfa023d409d9b2a8531965a377",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095a3c33a7f0eda324fedf1fa2a4abacdc79514cfa023d409d9b2a8531965a377a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4a095ed68ddc82a5d673a33233fcbc639b2268765a9162b6ceef5226f1b16f30",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x552c6dc27f4ee56d86887be744dec21065caca29641df6f2c782d7cd3b87c8a0",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -480,67 +500,216 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f49117",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7636ee9",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xfa1a595d85be16b96788513d2e686b05e7ff560a3a72c845c226118660f04295",
+                    "mixHash" : "0x6c6116374f305ad52b574c3c9254af771ff4b7270ee95eebc941295ed9d4ad87",
+                    "nonce" : "0x2be659fab71416f2",
+                    "number" : "0x01",
+                    "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0xbebbbd99c1481b46db83269271b08fb4a04310c15693e73c7086ef187b508d22",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bebbbd99c1481b46db83269271b08fb4a04310c15693e73c7086ef187b508d22a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a06c6116374f305ad52b574c3c9254af771ff4b7270ee95eebc941295ed9d4ad87882be659fab71416f2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xfa1a595d85be16b96788513d2e686b05e7ff560a3a72c845c226118660f04295",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_d0g0v0.json
index 6095bc991..9f42ddee4 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcall_100_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "66370f8c31e8d2034067916d8429ae261b344812be1332d2753ee6b0aa7b6f20",
-                    "mixHash" : "68abf1b677276fdc18ec470dcdf92c8b8ce70fc0ff8f07ff9681ab1a5d4e39bd",
-                    "nonce" : "2966fbce5cd874c0",
+                    "hash" : "0xa3993e22907e7512d1d0ba5b14fdac94be973e0c5f712dde643437aade090238",
+                    "mixHash" : "0x7975ef6a252365dbef6933cc9671c7daa0513d6dbcee70d8a53024a2c0d85863",
+                    "nonce" : "0x18ce2d744ebf4471",
                     "number" : "0x01",
-                    "parentHash" : "a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
-                    "receiptTrie" : "58fb6f06e749766a3d91e784d2eadbaeff743a5d73028a4c743122cc8885033a",
-                    "stateRoot" : "240cc6180be6bf7ceafe681bb6d7ac19f238801c277c424f923b60ad4ff20f12",
+                    "parentHash" : "0xa2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
+                    "receiptTrie" : "0x58fb6f06e749766a3d91e784d2eadbaeff743a5d73028a4c743122cc8885033a",
+                    "stateRoot" : "0x240cc6180be6bf7ceafe681bb6d7ac19f238801c277c424f923b60ad4ff20f12",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0240cc6180be6bf7ceafe681bb6d7ac19f238801c277c424f923b60ad4ff20f12a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a058fb6f06e749766a3d91e784d2eadbaeff743a5d73028a4c743122cc8885033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a068abf1b677276fdc18ec470dcdf92c8b8ce70fc0ff8f07ff9681ab1a5d4e39bd882966fbce5cd874c0f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0240cc6180be6bf7ceafe681bb6d7ac19f238801c277c424f923b60ad4ff20f12a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a058fb6f06e749766a3d91e784d2eadbaeff743a5d73028a4c743122cc8885033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a07975ef6a252365dbef6933cc9671c7daa0513d6dbcee70d8a53024a2c0d858638818ce2d744ebf4471f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f5e8c7770721c0e0e8a083e62cdb8b9a3be69f083e78525b70803fb25f5ff534",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf5e8c7770721c0e0e8a083e62cdb8b9a3be69f083e78525b70803fb25f5ff534",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5e8c7770721c0e0e8a083e62cdb8b9a3be69f083e78525b70803fb25f5ff534a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "66370f8c31e8d2034067916d8429ae261b344812be1332d2753ee6b0aa7b6f20",
+        "lastblockhash" : "0xa3993e22907e7512d1d0ba5b14fdac94be973e0c5f712dde643437aade090238",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -69,14 +74,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
@@ -84,7 +89,7 @@
                     "0x02" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x03",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
@@ -99,53 +104,53 @@
                     "0x07" : "0x03"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f804a3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ffb5d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -153,36 +158,41 @@
         }
     },
     "callcodecallcall_100_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "e26e765b91cf28a860feb751ffdea42b8271f94e7c399dc1651cd76fc188fc14",
-                    "mixHash" : "7b0e6b9f23ff96c610b01b6489f61f4e3b5d84ea9b9abe88be1c23cae0ab17b2",
-                    "nonce" : "2917688dfb7d0596",
+                    "hash" : "0x9620094ef32278f0d35b7e0a9ce4a6bc5fccf5e08e26c1cc0f6d764433ebbfe4",
+                    "mixHash" : "0x25088d9a4394c10b9653263f38a5ac6867b12e3d760de586f255d1f8f459ea59",
+                    "nonce" : "0x6b32a7c077b17fae",
                     "number" : "0x01",
-                    "parentHash" : "a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
-                    "receiptTrie" : "58fb6f06e749766a3d91e784d2eadbaeff743a5d73028a4c743122cc8885033a",
-                    "stateRoot" : "240cc6180be6bf7ceafe681bb6d7ac19f238801c277c424f923b60ad4ff20f12",
+                    "parentHash" : "0xa2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
+                    "receiptTrie" : "0x58fb6f06e749766a3d91e784d2eadbaeff743a5d73028a4c743122cc8885033a",
+                    "stateRoot" : "0x240cc6180be6bf7ceafe681bb6d7ac19f238801c277c424f923b60ad4ff20f12",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0240cc6180be6bf7ceafe681bb6d7ac19f238801c277c424f923b60ad4ff20f12a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a058fb6f06e749766a3d91e784d2eadbaeff743a5d73028a4c743122cc8885033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a07b0e6b9f23ff96c610b01b6489f61f4e3b5d84ea9b9abe88be1c23cae0ab17b2882917688dfb7d0596f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0240cc6180be6bf7ceafe681bb6d7ac19f238801c277c424f923b60ad4ff20f12a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a058fb6f06e749766a3d91e784d2eadbaeff743a5d73028a4c743122cc8885033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a025088d9a4394c10b9653263f38a5ac6867b12e3d760de586f255d1f8f459ea59886b32a7c077b17faef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -192,28 +202,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f5e8c7770721c0e0e8a083e62cdb8b9a3be69f083e78525b70803fb25f5ff534",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf5e8c7770721c0e0e8a083e62cdb8b9a3be69f083e78525b70803fb25f5ff534",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5e8c7770721c0e0e8a083e62cdb8b9a3be69f083e78525b70803fb25f5ff534a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e26e765b91cf28a860feb751ffdea42b8271f94e7c399dc1651cd76fc188fc14",
+        "lastblockhash" : "0x9620094ef32278f0d35b7e0a9ce4a6bc5fccf5e08e26c1cc0f6d764433ebbfe4",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -222,14 +232,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
@@ -237,7 +247,7 @@
                     "0x02" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x03",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
@@ -252,53 +262,53 @@
                     "0x07" : "0x03"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f804a3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ffb5d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -306,36 +316,41 @@
         }
     },
     "callcodecallcall_100_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "c6ec055624cf47b30a1622084c899ee20f2bd6081dbac100034e2d27447e6674",
-                    "mixHash" : "799e31d52bb70f144981fdab573269660b12041691457c7e08a84aa16d783fda",
-                    "nonce" : "807c44bcc64df8a2",
+                    "hash" : "0xa27b86e926f7e4f671f8135706655be86968ef8aaf2299e6550a6883fa6adf16",
+                    "mixHash" : "0x4f834931ab591c3943e6664f360085e0ccd3d56c81174e7938555ecee50d58f2",
+                    "nonce" : "0x4059a917f44793f9",
                     "number" : "0x01",
-                    "parentHash" : "a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
-                    "receiptTrie" : "9b0b78cf128285b281bf2546b57d552e13045534c2664c64e239f2232a04e64f",
-                    "stateRoot" : "947649b46af539723a82fe079d27cb5a5e1940668bf7753ec78ce2a81e231a3a",
+                    "parentHash" : "0xa2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
+                    "receiptTrie" : "0x9b0b78cf128285b281bf2546b57d552e13045534c2664c64e239f2232a04e64f",
+                    "stateRoot" : "0x947649b46af539723a82fe079d27cb5a5e1940668bf7753ec78ce2a81e231a3a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0947649b46af539723a82fe079d27cb5a5e1940668bf7753ec78ce2a81e231a3aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09b0b78cf128285b281bf2546b57d552e13045534c2664c64e239f2232a04e64fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0799e31d52bb70f144981fdab573269660b12041691457c7e08a84aa16d783fda88807c44bcc64df8a2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0947649b46af539723a82fe079d27cb5a5e1940668bf7753ec78ce2a81e231a3aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09b0b78cf128285b281bf2546b57d552e13045534c2664c64e239f2232a04e64fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a04f834931ab591c3943e6664f360085e0ccd3d56c81174e7938555ecee50d58f2884059a917f44793f9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -345,28 +360,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f5e8c7770721c0e0e8a083e62cdb8b9a3be69f083e78525b70803fb25f5ff534",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf5e8c7770721c0e0e8a083e62cdb8b9a3be69f083e78525b70803fb25f5ff534",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5e8c7770721c0e0e8a083e62cdb8b9a3be69f083e78525b70803fb25f5ff534a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c6ec055624cf47b30a1622084c899ee20f2bd6081dbac100034e2d27447e6674",
+        "lastblockhash" : "0xa27b86e926f7e4f671f8135706655be86968ef8aaf2299e6550a6883fa6adf16",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -375,14 +390,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
@@ -390,7 +405,7 @@
                     "0x02" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x03",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
@@ -405,53 +420,53 @@
                     "0x07" : "0x03"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7fce7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7600319",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -459,36 +474,41 @@
         }
     },
     "callcodecallcall_100_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "c2278bc7abdd0fad6d94bc6eab76b871788fed4e4c25ff3fa1dcde0c840efb59",
-                    "mixHash" : "c71fe3f2fc1bdb68fe8e15c48655bd126ecffe46808ebd28ca8a6f0d80cc7e2c",
-                    "nonce" : "b08d8d8163ccfa2e",
+                    "hash" : "0x54f89b6ea34387b7d60e8d45f201091bb0aba18883d759bfdedbcfe9d981a53f",
+                    "mixHash" : "0x1de1a057fba205527cf74c7e6dc30743b79608a48f69653fd82fe71a3d8e97a7",
+                    "nonce" : "0x420bbd8c77735a7a",
                     "number" : "0x01",
-                    "parentHash" : "a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
-                    "receiptTrie" : "9b0b78cf128285b281bf2546b57d552e13045534c2664c64e239f2232a04e64f",
-                    "stateRoot" : "947649b46af539723a82fe079d27cb5a5e1940668bf7753ec78ce2a81e231a3a",
+                    "parentHash" : "0xa2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
+                    "receiptTrie" : "0x9b0b78cf128285b281bf2546b57d552e13045534c2664c64e239f2232a04e64f",
+                    "stateRoot" : "0x947649b46af539723a82fe079d27cb5a5e1940668bf7753ec78ce2a81e231a3a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0947649b46af539723a82fe079d27cb5a5e1940668bf7753ec78ce2a81e231a3aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09b0b78cf128285b281bf2546b57d552e13045534c2664c64e239f2232a04e64fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0c71fe3f2fc1bdb68fe8e15c48655bd126ecffe46808ebd28ca8a6f0d80cc7e2c88b08d8d8163ccfa2ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0947649b46af539723a82fe079d27cb5a5e1940668bf7753ec78ce2a81e231a3aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09b0b78cf128285b281bf2546b57d552e13045534c2664c64e239f2232a04e64fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a01de1a057fba205527cf74c7e6dc30743b79608a48f69653fd82fe71a3d8e97a788420bbd8c77735a7af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -498,28 +518,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f5e8c7770721c0e0e8a083e62cdb8b9a3be69f083e78525b70803fb25f5ff534",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf5e8c7770721c0e0e8a083e62cdb8b9a3be69f083e78525b70803fb25f5ff534",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5e8c7770721c0e0e8a083e62cdb8b9a3be69f083e78525b70803fb25f5ff534a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c2278bc7abdd0fad6d94bc6eab76b871788fed4e4c25ff3fa1dcde0c840efb59",
+        "lastblockhash" : "0x54f89b6ea34387b7d60e8d45f201091bb0aba18883d759bfdedbcfe9d981a53f",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -528,14 +548,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
@@ -543,7 +563,7 @@
                     "0x02" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x03",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
@@ -558,53 +578,218 @@
                     "0x07" : "0x03"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7fce7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7600319",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0xcf0553cd25752e3d29fbd3712517d043ea7673b0a86f429067d0e6c1f600cf48",
+                    "mixHash" : "0x34450aa4964f8f76fd72bc409a363ca879f4c7aec97081a3a0d9037a078fa4fa",
+                    "nonce" : "0x0f7bf9dc28919939",
+                    "number" : "0x01",
+                    "parentHash" : "0xa2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0xdde0a0f8698fd450c7d003282a496e36eb6c7f94a1e7bd7f64b76d982e7fa25e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dde0a0f8698fd450c7d003282a496e36eb6c7f94a1e7bd7f64b76d982e7fa25ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a034450aa4964f8f76fd72bc409a363ca879f4c7aec97081a3a0d9037a078fa4fa880f7bf9dc28919939f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xcf0553cd25752e3d29fbd3712517d043ea7673b0a86f429067d0e6c1f600cf48",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE_d0g0v0.json
index 65faa99f1..4aac25e1c 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcall_ABCB_RECURSIVE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "16fd0adf93b418628ae9bb564907fd52f56082302052af504f2346c7aa439308",
-                    "mixHash" : "933e1484da300b77ddfab5c0fcc05a5e5858468dcea77b5e3ae8b41d222d5847",
-                    "nonce" : "3ca4b3e372686b21",
+                    "hash" : "0xe279152c2581a0df768ca3f0ceabb7880cc063112647bceb860a134bfd0a6070",
+                    "mixHash" : "0x17265ddb963b526b87d9504551f6d69a1307cde0a78f51301e0100af64deb70a",
+                    "nonce" : "0xdfa1a3f67ec07b72",
                     "number" : "0x01",
-                    "parentHash" : "425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
-                    "receiptTrie" : "79aa5d6bd6549f2350cb298e0f3d647c3d3daedba62a917aff381abbfbe0c92b",
-                    "stateRoot" : "b07c592b0af13c6db054fb7bb386215ab8f3dbf8192bc69cd84a8c9d5124c825",
+                    "parentHash" : "0x425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
+                    "receiptTrie" : "0x79aa5d6bd6549f2350cb298e0f3d647c3d3daedba62a917aff381abbfbe0c92b",
+                    "stateRoot" : "0xb07c592b0af13c6db054fb7bb386215ab8f3dbf8192bc69cd84a8c9d5124c825",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b07c592b0af13c6db054fb7bb386215ab8f3dbf8192bc69cd84a8c9d5124c825a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a079aa5d6bd6549f2350cb298e0f3d647c3d3daedba62a917aff381abbfbe0c92bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0933e1484da300b77ddfab5c0fcc05a5e5858468dcea77b5e3ae8b41d222d5847883ca4b3e372686b21f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b07c592b0af13c6db054fb7bb386215ab8f3dbf8192bc69cd84a8c9d5124c825a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a079aa5d6bd6549f2350cb298e0f3d647c3d3daedba62a917aff381abbfbe0c92bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a017265ddb963b526b87d9504551f6d69a1307cde0a78f51301e0100af64deb70a88dfa1a3f67ec07b72f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c14f55afe86959ef085c8c80be33857eff39cbe9c0c954891f10d2526db61b6c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc14f55afe86959ef085c8c80be33857eff39cbe9c0c954891f10d2526db61b6c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c14f55afe86959ef085c8c80be33857eff39cbe9c0c954891f10d2526db61b6ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "16fd0adf93b418628ae9bb564907fd52f56082302052af504f2346c7aa439308",
+        "lastblockhash" : "0xe279152c2581a0df768ca3f0ceabb7880cc063112647bceb860a134bfd0a6070",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
@@ -69,60 +74,60 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fcab7e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5482",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -130,36 +135,41 @@
         }
     },
     "callcodecallcall_ABCB_RECURSIVE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "c9e49ab4eba841be06d0e9b3655c3243dae354c066fa8cec459638b38b24bc94",
-                    "mixHash" : "108807ef01b42e20b1903ebe30468c30143c0bd4de2984115cfc371723f301b7",
-                    "nonce" : "4f7d514d4fcd2550",
+                    "hash" : "0xc7a2acd0aa13984a35939adc2948909b2c80e4de9c6196cdbf8631415c5cf8f1",
+                    "mixHash" : "0x2d736f7e6f1dc6cd6b459e97d77301bad9d69dd5fc3d0f7e148828bd1408a8a2",
+                    "nonce" : "0x97ac4b22b16f7d30",
                     "number" : "0x01",
-                    "parentHash" : "425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
-                    "receiptTrie" : "79aa5d6bd6549f2350cb298e0f3d647c3d3daedba62a917aff381abbfbe0c92b",
-                    "stateRoot" : "b07c592b0af13c6db054fb7bb386215ab8f3dbf8192bc69cd84a8c9d5124c825",
+                    "parentHash" : "0x425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
+                    "receiptTrie" : "0x79aa5d6bd6549f2350cb298e0f3d647c3d3daedba62a917aff381abbfbe0c92b",
+                    "stateRoot" : "0xb07c592b0af13c6db054fb7bb386215ab8f3dbf8192bc69cd84a8c9d5124c825",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b07c592b0af13c6db054fb7bb386215ab8f3dbf8192bc69cd84a8c9d5124c825a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a079aa5d6bd6549f2350cb298e0f3d647c3d3daedba62a917aff381abbfbe0c92bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0108807ef01b42e20b1903ebe30468c30143c0bd4de2984115cfc371723f301b7884f7d514d4fcd2550f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b07c592b0af13c6db054fb7bb386215ab8f3dbf8192bc69cd84a8c9d5124c825a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a079aa5d6bd6549f2350cb298e0f3d647c3d3daedba62a917aff381abbfbe0c92bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a02d736f7e6f1dc6cd6b459e97d77301bad9d69dd5fc3d0f7e148828bd1408a8a28897ac4b22b16f7d30f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -169,28 +179,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c14f55afe86959ef085c8c80be33857eff39cbe9c0c954891f10d2526db61b6c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc14f55afe86959ef085c8c80be33857eff39cbe9c0c954891f10d2526db61b6c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c14f55afe86959ef085c8c80be33857eff39cbe9c0c954891f10d2526db61b6ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c9e49ab4eba841be06d0e9b3655c3243dae354c066fa8cec459638b38b24bc94",
+        "lastblockhash" : "0xc7a2acd0aa13984a35939adc2948909b2c80e4de9c6196cdbf8631415c5cf8f1",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
@@ -199,60 +209,60 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fcab7e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5482",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -260,36 +270,41 @@
         }
     },
     "callcodecallcall_ABCB_RECURSIVE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "08b31c7d777082fc9c0203531701638d3e5a11febf6aec376e13fb7c5a763a54",
-                    "mixHash" : "afe2ae2294a610f222b8305eab17b05dfb0a92548366fe8a5209f84f0c459855",
-                    "nonce" : "12f921e9dd6ef704",
+                    "hash" : "0xf345bcbd7b4eefdcaf8b03174cd30ac81081c4a1867550ec8cf9d842e64ff746",
+                    "mixHash" : "0x2cec2333697a20219fbebc4c21fcc05d954c72d48c8c7c2f54fbb5ed200c248a",
+                    "nonce" : "0xeb2486149740ae5b",
                     "number" : "0x01",
-                    "parentHash" : "425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
-                    "receiptTrie" : "ff480b05b322d5c4b6a6c53dbc2afc2308a613d04176749a060e799d2b52e681",
-                    "stateRoot" : "69efdf2565cd544df48ebd72a562b8714cb81b4e61e48dc225d8e3ae4c7d27a7",
+                    "parentHash" : "0x425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
+                    "receiptTrie" : "0xff480b05b322d5c4b6a6c53dbc2afc2308a613d04176749a060e799d2b52e681",
+                    "stateRoot" : "0x69efdf2565cd544df48ebd72a562b8714cb81b4e61e48dc225d8e3ae4c7d27a7",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069efdf2565cd544df48ebd72a562b8714cb81b4e61e48dc225d8e3ae4c7d27a7a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0ff480b05b322d5c4b6a6c53dbc2afc2308a613d04176749a060e799d2b52e681b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0afe2ae2294a610f222b8305eab17b05dfb0a92548366fe8a5209f84f0c4598558812f921e9dd6ef704f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069efdf2565cd544df48ebd72a562b8714cb81b4e61e48dc225d8e3ae4c7d27a7a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0ff480b05b322d5c4b6a6c53dbc2afc2308a613d04176749a060e799d2b52e681b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a02cec2333697a20219fbebc4c21fcc05d954c72d48c8c7c2f54fbb5ed200c248a88eb2486149740ae5bf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -299,28 +314,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c14f55afe86959ef085c8c80be33857eff39cbe9c0c954891f10d2526db61b6c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc14f55afe86959ef085c8c80be33857eff39cbe9c0c954891f10d2526db61b6c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c14f55afe86959ef085c8c80be33857eff39cbe9c0c954891f10d2526db61b6ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "08b31c7d777082fc9c0203531701638d3e5a11febf6aec376e13fb7c5a763a54",
+        "lastblockhash" : "0xf345bcbd7b4eefdcaf8b03174cd30ac81081c4a1867550ec8cf9d842e64ff746",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
@@ -329,60 +344,60 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fca3c2",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5c3e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -390,36 +405,41 @@
         }
     },
     "callcodecallcall_ABCB_RECURSIVE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "c480a16958eb06fc2ed7225990b22ec8b1457f8796d5399fb033487e28bd1018",
-                    "mixHash" : "a8f35da0c124a6503f50dc8b5781c66b49719657b8348bc6883cc8b2b17f900f",
-                    "nonce" : "9f74f16a5b13d672",
+                    "hash" : "0xedd3ecbea2ab689c2d0f3cce3ca084d3820d1981a30420ac402c69ac8f258a70",
+                    "mixHash" : "0x2293cfe4587273249cee4bf487e8ed786c63ab0a406efbe21c3749e766f213fa",
+                    "nonce" : "0xb6258e1778764ad0",
                     "number" : "0x01",
-                    "parentHash" : "425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
-                    "receiptTrie" : "ff480b05b322d5c4b6a6c53dbc2afc2308a613d04176749a060e799d2b52e681",
-                    "stateRoot" : "69efdf2565cd544df48ebd72a562b8714cb81b4e61e48dc225d8e3ae4c7d27a7",
+                    "parentHash" : "0x425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
+                    "receiptTrie" : "0xff480b05b322d5c4b6a6c53dbc2afc2308a613d04176749a060e799d2b52e681",
+                    "stateRoot" : "0x69efdf2565cd544df48ebd72a562b8714cb81b4e61e48dc225d8e3ae4c7d27a7",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069efdf2565cd544df48ebd72a562b8714cb81b4e61e48dc225d8e3ae4c7d27a7a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0ff480b05b322d5c4b6a6c53dbc2afc2308a613d04176749a060e799d2b52e681b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0a8f35da0c124a6503f50dc8b5781c66b49719657b8348bc6883cc8b2b17f900f889f74f16a5b13d672f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069efdf2565cd544df48ebd72a562b8714cb81b4e61e48dc225d8e3ae4c7d27a7a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0ff480b05b322d5c4b6a6c53dbc2afc2308a613d04176749a060e799d2b52e681b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a02293cfe4587273249cee4bf487e8ed786c63ab0a406efbe21c3749e766f213fa88b6258e1778764ad0f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -429,28 +449,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c14f55afe86959ef085c8c80be33857eff39cbe9c0c954891f10d2526db61b6c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc14f55afe86959ef085c8c80be33857eff39cbe9c0c954891f10d2526db61b6c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c14f55afe86959ef085c8c80be33857eff39cbe9c0c954891f10d2526db61b6ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c480a16958eb06fc2ed7225990b22ec8b1457f8796d5399fb033487e28bd1018",
+        "lastblockhash" : "0xedd3ecbea2ab689c2d0f3cce3ca084d3820d1981a30420ac402c69ac8f258a70",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
@@ -459,60 +479,202 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fca3c2",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5c3e",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x15ca6dca7a6854f710a21155e3b0dd91520d2c9741711c6098eff59a45649cfe",
+                    "mixHash" : "0x6f32a165768879e1e26aaf8a42b5f374d17704201982cd889b9ecb377d247956",
+                    "nonce" : "0x074fec6083234540",
+                    "number" : "0x01",
+                    "parentHash" : "0x425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0x5370f3e138c4959982cdd6494f49321543c80a7fd329d556dfcdafb03c4fea57",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05370f3e138c4959982cdd6494f49321543c80a7fd329d556dfcdafb03c4fea57a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a06f32a165768879e1e26aaf8a42b5f374d17704201982cd889b9ecb377d24795688074fec6083234540f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "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" : "0x15ca6dca7a6854f710a21155e3b0dd91520d2c9741711c6098eff59a45649cfe",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE_d0g0v0.json
index 9c5444325..592917e5d 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcallcode_101_OOGE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "c0118476acf2321a2669edec97fd1848d30dbb1f3e2a5d532ee22d6543ea0d7a",
-                    "mixHash" : "70d674ab8c24841b4b07c5e0fa142eefe6e217a4bac2c17b84e374190ac1815e",
-                    "nonce" : "cbdc620906502401",
+                    "hash" : "0xb892b92e168f2922a10c712115baa511b5b7c15b786e950a1d9b30c6e9b82cb3",
+                    "mixHash" : "0x568e97ae20b6e920db93b7feba945c7d43adb9285c19677aa7dbd33d956303cc",
+                    "nonce" : "0xe95e392a42397650",
                     "number" : "0x01",
-                    "parentHash" : "78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
-                    "receiptTrie" : "0f82446fc4e7ba087c710827de22f10e7951134f9f2c6d1ecd36b8201ed42c83",
-                    "stateRoot" : "abeb2b72b7c78ae544fd4c56f1bc5c5d6898106ecaca49f521ec85ec2e233b63",
+                    "parentHash" : "0x78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
+                    "receiptTrie" : "0x0f82446fc4e7ba087c710827de22f10e7951134f9f2c6d1ecd36b8201ed42c83",
+                    "stateRoot" : "0xabeb2b72b7c78ae544fd4c56f1bc5c5d6898106ecaca49f521ec85ec2e233b63",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a078b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abeb2b72b7c78ae544fd4c56f1bc5c5d6898106ecaca49f521ec85ec2e233b63a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00f82446fc4e7ba087c710827de22f10e7951134f9f2c6d1ecd36b8201ed42c83b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a070d674ab8c24841b4b07c5e0fa142eefe6e217a4bac2c17b84e374190ac1815e88cbdc620906502401f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a078b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abeb2b72b7c78ae544fd4c56f1bc5c5d6898106ecaca49f521ec85ec2e233b63a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00f82446fc4e7ba087c710827de22f10e7951134f9f2c6d1ecd36b8201ed42c83b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0568e97ae20b6e920db93b7feba945c7d43adb9285c19677aa7dbd33d956303cc88e95e392a42397650f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "d352493cfe8f1718e845d4d460782e7a07e48cbec0cb5fd136a610f8b71ee2d4",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd352493cfe8f1718e845d4d460782e7a07e48cbec0cb5fd136a610f8b71ee2d4",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d352493cfe8f1718e845d4d460782e7a07e48cbec0cb5fd136a610f8b71ee2d4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c0118476acf2321a2669edec97fd1848d30dbb1f3e2a5d532ee22d6543ea0d7a",
+        "lastblockhash" : "0xb892b92e168f2922a10c712115baa511b5b7c15b786e950a1d9b30c6e9b82cb3",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -69,74 +74,74 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55892",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762a76e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -144,36 +149,41 @@
         }
     },
     "callcodecallcallcode_101_OOGE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "3cc684a51032758aa9a83e95de08d5ddce328e7be4ef7331b37eefecfa68363d",
-                    "mixHash" : "92b48ee5ace8b811138c735b262023cb5e7b8ca8c0e79656329bdcc1d4abd61e",
-                    "nonce" : "5a0b805b1161a410",
+                    "hash" : "0x907d853be15d93ee29bcc955bad9b86c726f051d024ce3728a0abc20b3afdad6",
+                    "mixHash" : "0x6135ea407f04d24b25d1a814fe98a0b5b6a53361e835d1439978156c9d653d91",
+                    "nonce" : "0x5c6ff67be3d780a1",
                     "number" : "0x01",
-                    "parentHash" : "78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
-                    "receiptTrie" : "0f82446fc4e7ba087c710827de22f10e7951134f9f2c6d1ecd36b8201ed42c83",
-                    "stateRoot" : "abeb2b72b7c78ae544fd4c56f1bc5c5d6898106ecaca49f521ec85ec2e233b63",
+                    "parentHash" : "0x78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
+                    "receiptTrie" : "0x0f82446fc4e7ba087c710827de22f10e7951134f9f2c6d1ecd36b8201ed42c83",
+                    "stateRoot" : "0xabeb2b72b7c78ae544fd4c56f1bc5c5d6898106ecaca49f521ec85ec2e233b63",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a078b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abeb2b72b7c78ae544fd4c56f1bc5c5d6898106ecaca49f521ec85ec2e233b63a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00f82446fc4e7ba087c710827de22f10e7951134f9f2c6d1ecd36b8201ed42c83b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a092b48ee5ace8b811138c735b262023cb5e7b8ca8c0e79656329bdcc1d4abd61e885a0b805b1161a410f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a078b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abeb2b72b7c78ae544fd4c56f1bc5c5d6898106ecaca49f521ec85ec2e233b63a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00f82446fc4e7ba087c710827de22f10e7951134f9f2c6d1ecd36b8201ed42c83b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a06135ea407f04d24b25d1a814fe98a0b5b6a53361e835d1439978156c9d653d91885c6ff67be3d780a1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -183,28 +193,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "d352493cfe8f1718e845d4d460782e7a07e48cbec0cb5fd136a610f8b71ee2d4",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd352493cfe8f1718e845d4d460782e7a07e48cbec0cb5fd136a610f8b71ee2d4",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d352493cfe8f1718e845d4d460782e7a07e48cbec0cb5fd136a610f8b71ee2d4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3cc684a51032758aa9a83e95de08d5ddce328e7be4ef7331b37eefecfa68363d",
+        "lastblockhash" : "0x907d853be15d93ee29bcc955bad9b86c726f051d024ce3728a0abc20b3afdad6",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -213,74 +223,74 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55892",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762a76e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -288,36 +298,41 @@
         }
     },
     "callcodecallcallcode_101_OOGE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "bbf58d48894609d79a64ec06e75121b795306111c63a96c5d98e1dabaef3b1f1",
-                    "mixHash" : "bc833ca6e84c624495740049c55066509ca9fc0f4a213502875b56e12729e717",
-                    "nonce" : "dea63e2aa4fcf00e",
+                    "hash" : "0x3ce42be078aaf04b833fb4ba8d96e646ec76b7af3ae15bc53b151e0db67e6fbf",
+                    "mixHash" : "0x73d54e81a5556d2d688d80e2cb137283c479206ecb77d599a771814ce600366c",
+                    "nonce" : "0x045fa85b2a7aac9c",
                     "number" : "0x01",
-                    "parentHash" : "78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
-                    "receiptTrie" : "d7090fb88ad2318242df5308820eaecf0f2071ebc97213ed8606cface86ab5de",
-                    "stateRoot" : "7ad3b55241b119672ea9bce47ed6cf2224a5fcabc86b21dba9c516652760ef64",
+                    "parentHash" : "0x78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
+                    "receiptTrie" : "0xd7090fb88ad2318242df5308820eaecf0f2071ebc97213ed8606cface86ab5de",
+                    "stateRoot" : "0x7ad3b55241b119672ea9bce47ed6cf2224a5fcabc86b21dba9c516652760ef64",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a078b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ad3b55241b119672ea9bce47ed6cf2224a5fcabc86b21dba9c516652760ef64a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0d7090fb88ad2318242df5308820eaecf0f2071ebc97213ed8606cface86ab5deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0bc833ca6e84c624495740049c55066509ca9fc0f4a213502875b56e12729e71788dea63e2aa4fcf00ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a078b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ad3b55241b119672ea9bce47ed6cf2224a5fcabc86b21dba9c516652760ef64a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0d7090fb88ad2318242df5308820eaecf0f2071ebc97213ed8606cface86ab5deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a073d54e81a5556d2d688d80e2cb137283c479206ecb77d599a771814ce600366c88045fa85b2a7aac9cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -327,28 +342,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "d352493cfe8f1718e845d4d460782e7a07e48cbec0cb5fd136a610f8b71ee2d4",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd352493cfe8f1718e845d4d460782e7a07e48cbec0cb5fd136a610f8b71ee2d4",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d352493cfe8f1718e845d4d460782e7a07e48cbec0cb5fd136a610f8b71ee2d4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "bbf58d48894609d79a64ec06e75121b795306111c63a96c5d98e1dabaef3b1f1",
+        "lastblockhash" : "0x3ce42be078aaf04b833fb4ba8d96e646ec76b7af3ae15bc53b151e0db67e6fbf",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -357,74 +372,74 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550d6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af2a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -432,36 +447,41 @@
         }
     },
     "callcodecallcallcode_101_OOGE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "5cc951f081b86e9653194e54f382ab741632e7adcea2284c99b3692def6c1cce",
-                    "mixHash" : "169f6999758fdd606f4754b47abaa83c8ab1771d6c629a24d2ba5b0440e48bd2",
-                    "nonce" : "7f7fd47dceb5fd09",
+                    "hash" : "0xd516a4173473759ea7a8075b2ed0cdabe0e419394ff8ec1a4b7ce4fb558649c1",
+                    "mixHash" : "0xc172d5e45957331460ee2fc228460dd6b9811bfe519a08d1836d657384157248",
+                    "nonce" : "0xbe14ea1c05689656",
                     "number" : "0x01",
-                    "parentHash" : "78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
-                    "receiptTrie" : "d7090fb88ad2318242df5308820eaecf0f2071ebc97213ed8606cface86ab5de",
-                    "stateRoot" : "7ad3b55241b119672ea9bce47ed6cf2224a5fcabc86b21dba9c516652760ef64",
+                    "parentHash" : "0x78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
+                    "receiptTrie" : "0xd7090fb88ad2318242df5308820eaecf0f2071ebc97213ed8606cface86ab5de",
+                    "stateRoot" : "0x7ad3b55241b119672ea9bce47ed6cf2224a5fcabc86b21dba9c516652760ef64",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a078b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ad3b55241b119672ea9bce47ed6cf2224a5fcabc86b21dba9c516652760ef64a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0d7090fb88ad2318242df5308820eaecf0f2071ebc97213ed8606cface86ab5deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0169f6999758fdd606f4754b47abaa83c8ab1771d6c629a24d2ba5b0440e48bd2887f7fd47dceb5fd09f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a078b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ad3b55241b119672ea9bce47ed6cf2224a5fcabc86b21dba9c516652760ef64a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0d7090fb88ad2318242df5308820eaecf0f2071ebc97213ed8606cface86ab5deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0c172d5e45957331460ee2fc228460dd6b9811bfe519a08d1836d65738415724888be14ea1c05689656f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -471,28 +491,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "d352493cfe8f1718e845d4d460782e7a07e48cbec0cb5fd136a610f8b71ee2d4",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd352493cfe8f1718e845d4d460782e7a07e48cbec0cb5fd136a610f8b71ee2d4",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d352493cfe8f1718e845d4d460782e7a07e48cbec0cb5fd136a610f8b71ee2d4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "5cc951f081b86e9653194e54f382ab741632e7adcea2284c99b3692def6c1cce",
+        "lastblockhash" : "0xd516a4173473759ea7a8075b2ed0cdabe0e419394ff8ec1a4b7ce4fb558649c1",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -501,74 +521,230 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550d6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af2a",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x886288466922077c8716fc80f8643c3579f219f7746326ac54e45e2546387f40",
+                    "mixHash" : "0x3d357668ca53ebfc1d5e97ce30b8ab522576122b79d8adb9e199776031995c7c",
+                    "nonce" : "0xb952b9144b316a9f",
+                    "number" : "0x01",
+                    "parentHash" : "0x78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0xc8233850f17d1fc7e5ecbaa522745f7cc15606bb590527949bafdb5b7396afca",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a078b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8233850f17d1fc7e5ecbaa522745f7cc15606bb590527949bafdb5b7396afcaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a03d357668ca53ebfc1d5e97ce30b8ab522576122b79d8adb9e199776031995c7c88b952b9144b316a9ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0x886288466922077c8716fc80f8643c3579f219f7746326ac54e45e2546387f40",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter_d0g0v0.json
index 6d12f6c1a..515103397 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcallcode_101_OOGMAfter_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "cbed13361019951f650a32e81d70dbad3ba84b018b42a5247854f2a3fa0ad7b4",
-                    "mixHash" : "3a6b3bfdabf81716093d4f8bbdbd7c6c8b4e97ed1604e0639998fd1c2fb11e1f",
-                    "nonce" : "ba95346f905493d8",
+                    "hash" : "0x59ad3e552450fbf2608fc84cedda88a4fa2fa089396da36a25a4b4143aec464c",
+                    "mixHash" : "0x20f853960eeb3724c8b0e9330f01b2e42143ffbf9a75c5c1d601a17610873ff3",
+                    "nonce" : "0x7ad5d7680475ad99",
                     "number" : "0x01",
-                    "parentHash" : "47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
-                    "receiptTrie" : "04c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24",
-                    "stateRoot" : "5eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3",
+                    "parentHash" : "0x47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
+                    "receiptTrie" : "0x04c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24",
+                    "stateRoot" : "0x5eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a047bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a03a6b3bfdabf81716093d4f8bbdbd7c6c8b4e97ed1604e0639998fd1c2fb11e1f88ba95346f905493d8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a047bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a020f853960eeb3724c8b0e9330f01b2e42143ffbf9a75c5c1d601a17610873ff3887ad5d7680475ad99f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "91bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x91bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "cbed13361019951f650a32e81d70dbad3ba84b018b42a5247854f2a3fa0ad7b4",
+        "lastblockhash" : "0x59ad3e552450fbf2608fc84cedda88a4fa2fa089396da36a25a4b4143aec464c",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcodecallcallcode_101_OOGMAfter_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "5eb4e5a6a92f290b4e46ede44b64481892e19d0436d3df19a64bfc9fa93d128a",
-                    "mixHash" : "fe59cb5fae9b49d4f188232e0ef8725a639092656dc3e80b8b146b2ab81737bf",
-                    "nonce" : "f893c0808f061046",
+                    "hash" : "0x94874aed7aaec253396621df89e58d972548132678602347ff401598dfce6d01",
+                    "mixHash" : "0x8d493af8aad8422f5dd857de33edf5107758bc2f994bd05813bbf4c07f7a3b2d",
+                    "nonce" : "0xd9c713f7ef6b1075",
                     "number" : "0x01",
-                    "parentHash" : "47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
-                    "receiptTrie" : "04c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24",
-                    "stateRoot" : "5eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3",
+                    "parentHash" : "0x47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
+                    "receiptTrie" : "0x04c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24",
+                    "stateRoot" : "0x5eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a047bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0fe59cb5fae9b49d4f188232e0ef8725a639092656dc3e80b8b146b2ab81737bf88f893c0808f061046f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a047bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a08d493af8aad8422f5dd857de33edf5107758bc2f994bd05813bbf4c07f7a3b2d88d9c713f7ef6b1075f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "91bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x91bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "5eb4e5a6a92f290b4e46ede44b64481892e19d0436d3df19a64bfc9fa93d128a",
+        "lastblockhash" : "0x94874aed7aaec253396621df89e58d972548132678602347ff401598dfce6d01",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcodecallcallcode_101_OOGMAfter_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "cb2071f3ecc5c5a1821fee1c84d119cf6ffa044bf0321f0b3fa1b04966776e08",
-                    "mixHash" : "ea94c7b908189781ee4e5ff25acf8b792ba86aeef1513882a8b0ebbbc840c4c9",
-                    "nonce" : "c81dbae6495f8385",
+                    "hash" : "0xf22ee9b2b96ab3bb30dd49108b3827547a268a73116ac9730ede0313dd58f12d",
+                    "mixHash" : "0xaf75228a73dcbe6ae5902ddbb4973a45746d19b71f253b90c017f0f3d0a5ccbb",
+                    "nonce" : "0xadce344b3caf03db",
                     "number" : "0x01",
-                    "parentHash" : "47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
-                    "receiptTrie" : "04e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95",
-                    "stateRoot" : "b490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199",
+                    "parentHash" : "0x47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
+                    "receiptTrie" : "0x04e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95",
+                    "stateRoot" : "0xb490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a047bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0ea94c7b908189781ee4e5ff25acf8b792ba86aeef1513882a8b0ebbbc840c4c988c81dbae6495f8385f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a047bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0af75228a73dcbe6ae5902ddbb4973a45746d19b71f253b90c017f0f3d0a5ccbb88adce344b3caf03dbf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "91bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x91bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "cb2071f3ecc5c5a1821fee1c84d119cf6ffa044bf0321f0b3fa1b04966776e08",
+        "lastblockhash" : "0xf22ee9b2b96ab3bb30dd49108b3827547a268a73116ac9730ede0313dd58f12d",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcodecallcallcode_101_OOGMAfter_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0e02758e20006db35ac58f032c910f2547f2c8be8bc57371c8a65e0be1b674ae",
-                    "mixHash" : "def80846a801572e5e9d6ae0e8d5593f4939a65354cbb005ed5677f025079514",
-                    "nonce" : "dc59449d1b4b1926",
+                    "hash" : "0xebc9bee02af2509bdb703115b5471dad61394f77ba7e85f2adc4b095460a5f71",
+                    "mixHash" : "0x9c7587ad869da53c9827f9d3ebcf646bd45e586a0e8fecb71e8e08f0db0c26c3",
+                    "nonce" : "0x1a41a31b18b27f99",
                     "number" : "0x01",
-                    "parentHash" : "47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
-                    "receiptTrie" : "04e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95",
-                    "stateRoot" : "b490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199",
+                    "parentHash" : "0x47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
+                    "receiptTrie" : "0x04e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95",
+                    "stateRoot" : "0xb490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a047bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0def80846a801572e5e9d6ae0e8d5593f4939a65354cbb005ed5677f02507951488dc59449d1b4b1926f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a047bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a09c7587ad869da53c9827f9d3ebcf646bd45e586a0e8fecb71e8e08f0db0c26c3881a41a31b18b27f99f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "91bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x91bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0e02758e20006db35ac58f032c910f2547f2c8be8bc57371c8a65e0be1b674ae",
+        "lastblockhash" : "0xebc9bee02af2509bdb703115b5471dad61394f77ba7e85f2adc4b095460a5f71",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xc506ef3360e8d6f737213c9340cc190310ec0ed8a2610c0d46b2103d02f80c16",
+                    "mixHash" : "0xfda0ea4fd8c3176c324a479e4d9ee513007f2c899690cb1490dde8b689a5ff8d",
+                    "nonce" : "0x3fb1cd6d311edd3a",
+                    "number" : "0x01",
+                    "parentHash" : "0x47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0x74862d483d67e69033b7fa05a307ab72d9f4671dead4487675e125b3f0b4f5e9",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a047bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074862d483d67e69033b7fa05a307ab72d9f4671dead4487675e125b3f0b4f5e9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0fda0ea4fd8c3176c324a479e4d9ee513007f2c899690cb1490dde8b689a5ff8d883fb1cd6d311edd3af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0xc506ef3360e8d6f737213c9340cc190310ec0ed8a2610c0d46b2103d02f80c16",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore_d0g0v0.json
index 3dc022626..8853959e2 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcallcode_101_OOGMBefore_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "5f4e08cd8fa01f80cbb0dcc0fabb06fa8323db4af9b70051f44b35e8705b6c2f",
-                    "mixHash" : "e9b9920f970852a9f3d8f2ab2fb0c156660c533edfef9261519a11d414828da4",
-                    "nonce" : "81ed5db679b79919",
+                    "hash" : "0x21067d7aac8f1e91024dc8e717bce3943aa521c5fbadc9cb4dc9c3b4cf92108b",
+                    "mixHash" : "0xa6656b963b63cfdc36161f229c5258014e1a5fc1c8fa904b7f199f8ec5d707b8",
+                    "nonce" : "0x6a94c5e2774040a2",
                     "number" : "0x01",
-                    "parentHash" : "e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
-                    "receiptTrie" : "cc5d5fe99416cb30b1c6765e13b7ba545a4777a93e3b60c6529bdca0de21f9eb",
-                    "stateRoot" : "6d2f690c1d1f9a3b02a917c773910eb029cfe841bacf41be4594215359aad788",
+                    "parentHash" : "0xe5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
+                    "receiptTrie" : "0xcc5d5fe99416cb30b1c6765e13b7ba545a4777a93e3b60c6529bdca0de21f9eb",
+                    "stateRoot" : "0x6d2f690c1d1f9a3b02a917c773910eb029cfe841bacf41be4594215359aad788",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d2f690c1d1f9a3b02a917c773910eb029cfe841bacf41be4594215359aad788a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0cc5d5fe99416cb30b1c6765e13b7ba545a4777a93e3b60c6529bdca0de21f9ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0e9b9920f970852a9f3d8f2ab2fb0c156660c533edfef9261519a11d414828da48881ed5db679b79919f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d2f690c1d1f9a3b02a917c773910eb029cfe841bacf41be4594215359aad788a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0cc5d5fe99416cb30b1c6765e13b7ba545a4777a93e3b60c6529bdca0de21f9ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0a6656b963b63cfdc36161f229c5258014e1a5fc1c8fa904b7f199f8ec5d707b8886a94c5e2774040a2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c1492545adf3dd13efe96411f1151aaa989f62e900e5ab3d55265998dff8c0ac",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc1492545adf3dd13efe96411f1151aaa989f62e900e5ab3d55265998dff8c0ac",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1492545adf3dd13efe96411f1151aaa989f62e900e5ab3d55265998dff8c0aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "5f4e08cd8fa01f80cbb0dcc0fabb06fa8323db4af9b70051f44b35e8705b6c2f",
+        "lastblockhash" : "0x21067d7aac8f1e91024dc8e717bce3943aa521c5fbadc9cb4dc9c3b4cf92108b",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa0c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcodecallcallcode_101_OOGMBefore_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "fb601f85e4f3f510daf2fae4bb78ad4fb4e9725a9a0c8da74de9970c90881343",
-                    "mixHash" : "a94f815fc7bd68169cd1f83eb2d1d2d98645bc07a7451106e24084371564ad8a",
-                    "nonce" : "0678fe0820536692",
+                    "hash" : "0xc221af8db6d25a68a9d6ec90b263dca276b72a533e7ce3c276484cf3a5ed2244",
+                    "mixHash" : "0x689e01ba1fe2b23a0e287ca7bebcb13a2c772acfbc5c4d0dad486a02c31b6e54",
+                    "nonce" : "0x45296133e6be931d",
                     "number" : "0x01",
-                    "parentHash" : "e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
-                    "receiptTrie" : "cc5d5fe99416cb30b1c6765e13b7ba545a4777a93e3b60c6529bdca0de21f9eb",
-                    "stateRoot" : "6d2f690c1d1f9a3b02a917c773910eb029cfe841bacf41be4594215359aad788",
+                    "parentHash" : "0xe5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
+                    "receiptTrie" : "0xcc5d5fe99416cb30b1c6765e13b7ba545a4777a93e3b60c6529bdca0de21f9eb",
+                    "stateRoot" : "0x6d2f690c1d1f9a3b02a917c773910eb029cfe841bacf41be4594215359aad788",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d2f690c1d1f9a3b02a917c773910eb029cfe841bacf41be4594215359aad788a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0cc5d5fe99416cb30b1c6765e13b7ba545a4777a93e3b60c6529bdca0de21f9ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0a94f815fc7bd68169cd1f83eb2d1d2d98645bc07a7451106e24084371564ad8a880678fe0820536692f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d2f690c1d1f9a3b02a917c773910eb029cfe841bacf41be4594215359aad788a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0cc5d5fe99416cb30b1c6765e13b7ba545a4777a93e3b60c6529bdca0de21f9ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0689e01ba1fe2b23a0e287ca7bebcb13a2c772acfbc5c4d0dad486a02c31b6e548845296133e6be931df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c1492545adf3dd13efe96411f1151aaa989f62e900e5ab3d55265998dff8c0ac",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc1492545adf3dd13efe96411f1151aaa989f62e900e5ab3d55265998dff8c0ac",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1492545adf3dd13efe96411f1151aaa989f62e900e5ab3d55265998dff8c0aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "fb601f85e4f3f510daf2fae4bb78ad4fb4e9725a9a0c8da74de9970c90881343",
+        "lastblockhash" : "0xc221af8db6d25a68a9d6ec90b263dca276b72a533e7ce3c276484cf3a5ed2244",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa0c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcodecallcallcode_101_OOGMBefore_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "31d43285949d4bacffcaa6f03319b16ca8d8beb505e2d693dae9969b0be6a4c6",
-                    "mixHash" : "55e9275bb53942c6bfec10fe7fb68fb33c60a28bc49671b2cebe2a259ada67f2",
-                    "nonce" : "4cfa7d3e93281e90",
+                    "hash" : "0x007fd3f5630d5e6e26d9c2dac04f94c7de0b76c648396ca97075ad574cb3ea18",
+                    "mixHash" : "0x1019e63483330adf46fca2b48eb3211f4ad688dbb493931fbce3c1209f7afaff",
+                    "nonce" : "0x2bdfe765be933bcb",
                     "number" : "0x01",
-                    "parentHash" : "e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
-                    "receiptTrie" : "c55d8843f05854c66f180b38144d7a85a89b40abb263a70c35757f94c4f89c0b",
-                    "stateRoot" : "633481416a7ac8155a08c77976860d87a7e3ed1647770238983456f73ab2e3c7",
+                    "parentHash" : "0xe5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
+                    "receiptTrie" : "0xc55d8843f05854c66f180b38144d7a85a89b40abb263a70c35757f94c4f89c0b",
+                    "stateRoot" : "0x633481416a7ac8155a08c77976860d87a7e3ed1647770238983456f73ab2e3c7",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0633481416a7ac8155a08c77976860d87a7e3ed1647770238983456f73ab2e3c7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c55d8843f05854c66f180b38144d7a85a89b40abb263a70c35757f94c4f89c0bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a055e9275bb53942c6bfec10fe7fb68fb33c60a28bc49671b2cebe2a259ada67f2884cfa7d3e93281e90f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0633481416a7ac8155a08c77976860d87a7e3ed1647770238983456f73ab2e3c7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c55d8843f05854c66f180b38144d7a85a89b40abb263a70c35757f94c4f89c0bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a01019e63483330adf46fca2b48eb3211f4ad688dbb493931fbce3c1209f7afaff882bdfe765be933bcbf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,28 +340,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c1492545adf3dd13efe96411f1151aaa989f62e900e5ab3d55265998dff8c0ac",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc1492545adf3dd13efe96411f1151aaa989f62e900e5ab3d55265998dff8c0ac",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1492545adf3dd13efe96411f1151aaa989f62e900e5ab3d55265998dff8c0aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "31d43285949d4bacffcaa6f03319b16ca8d8beb505e2d693dae9969b0be6a4c6",
+        "lastblockhash" : "0x007fd3f5630d5e6e26d9c2dac04f94c7de0b76c648396ca97075ad574cb3ea18",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -354,74 +369,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -429,36 +444,41 @@
         }
     },
     "callcodecallcallcode_101_OOGMBefore_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "fb1bdaa622c8e0de1c3526f8cae122378b2d3a7fc2779f7e0f93f19f1621d3fa",
-                    "mixHash" : "8386980ceddd26ecf2df8d51c0fe20b3f76f493a55e53a89410c748df8b9245d",
-                    "nonce" : "3991159e910f65ff",
+                    "hash" : "0xd82b5908008f24fbb4c5ee73fb8881849dcd95acd3382c3f8c1007fc22050544",
+                    "mixHash" : "0x350461a1c75479a5a1684c9e75b0b71fd229204b687a27cffe0746a7ca9dd2f0",
+                    "nonce" : "0x08fbbe07ef5cecc8",
                     "number" : "0x01",
-                    "parentHash" : "e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
-                    "receiptTrie" : "c55d8843f05854c66f180b38144d7a85a89b40abb263a70c35757f94c4f89c0b",
-                    "stateRoot" : "633481416a7ac8155a08c77976860d87a7e3ed1647770238983456f73ab2e3c7",
+                    "parentHash" : "0xe5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
+                    "receiptTrie" : "0xc55d8843f05854c66f180b38144d7a85a89b40abb263a70c35757f94c4f89c0b",
+                    "stateRoot" : "0x633481416a7ac8155a08c77976860d87a7e3ed1647770238983456f73ab2e3c7",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0633481416a7ac8155a08c77976860d87a7e3ed1647770238983456f73ab2e3c7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c55d8843f05854c66f180b38144d7a85a89b40abb263a70c35757f94c4f89c0bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a08386980ceddd26ecf2df8d51c0fe20b3f76f493a55e53a89410c748df8b9245d883991159e910f65fff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0633481416a7ac8155a08c77976860d87a7e3ed1647770238983456f73ab2e3c7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c55d8843f05854c66f180b38144d7a85a89b40abb263a70c35757f94c4f89c0bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0350461a1c75479a5a1684c9e75b0b71fd229204b687a27cffe0746a7ca9dd2f08808fbbe07ef5cecc8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -468,28 +488,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c1492545adf3dd13efe96411f1151aaa989f62e900e5ab3d55265998dff8c0ac",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc1492545adf3dd13efe96411f1151aaa989f62e900e5ab3d55265998dff8c0ac",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1492545adf3dd13efe96411f1151aaa989f62e900e5ab3d55265998dff8c0aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "fb1bdaa622c8e0de1c3526f8cae122378b2d3a7fc2779f7e0f93f19f1621d3fa",
+        "lastblockhash" : "0xd82b5908008f24fbb4c5ee73fb8881849dcd95acd3382c3f8c1007fc22050544",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -497,74 +517,229 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x0b0a15f29a72e3008c78ed79d2201ba562d8138a2d99d5c82d6dce068b248cb7",
+                    "mixHash" : "0xc1e807b4663c2bb13300e09c88b9a7a6d51239e9f0ec89997ab58d7d8e2c80be",
+                    "nonce" : "0x2a5a9b81cc5d98b4",
+                    "number" : "0x01",
+                    "parentHash" : "0xe5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0xec7d867f19228f698794346397d3648ed3039914246602c3ca8cc2c0ea617188",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec7d867f19228f698794346397d3648ed3039914246602c3ca8cc2c0ea617188a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0c1e807b4663c2bb13300e09c88b9a7a6d51239e9f0ec89997ab58d7d8e2c80be882a5a9b81cc5d98b4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0x0b0a15f29a72e3008c78ed79d2201ba562d8138a2d99d5c82d6dce068b248cb7",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd_d0g0v0.json
index 68882569a..3786e69f1 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcallcode_101_SuicideEnd_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "a2e32da03e18deaae00b1a491405ce5ceab7b7257970224966a2ea5e0cdbfcd8",
-                    "mixHash" : "7e5d1d62733a63293130db7f987d2f19b10a596b0e246202e85369b2da6334ce",
-                    "nonce" : "c6358388f2c9cd1f",
+                    "hash" : "0x9dbd137d952f0930422346a8bca39369a5d37d4cabaab2450cce9895c5dd3bb7",
+                    "mixHash" : "0x1b2e661062c78acf0ba57638f272b7bbc63380397cff36e7ce9bf452a92f5205",
+                    "nonce" : "0x49d141719e4269f8",
                     "number" : "0x01",
-                    "parentHash" : "ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
-                    "receiptTrie" : "2ccf0d7452bbaf8b10fd09f81805bf33be7a0e4bf5914fe4f1b6b01df48155f1",
-                    "stateRoot" : "541ccb3beac32c040b674f40511ebae6e213483c8c9a6609d74ea747c59ccbf7",
+                    "parentHash" : "0xef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
+                    "receiptTrie" : "0x2ccf0d7452bbaf8b10fd09f81805bf33be7a0e4bf5914fe4f1b6b01df48155f1",
+                    "stateRoot" : "0x541ccb3beac32c040b674f40511ebae6e213483c8c9a6609d74ea747c59ccbf7",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0541ccb3beac32c040b674f40511ebae6e213483c8c9a6609d74ea747c59ccbf7a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a02ccf0d7452bbaf8b10fd09f81805bf33be7a0e4bf5914fe4f1b6b01df48155f1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a07e5d1d62733a63293130db7f987d2f19b10a596b0e246202e85369b2da6334ce88c6358388f2c9cd1ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0541ccb3beac32c040b674f40511ebae6e213483c8c9a6609d74ea747c59ccbf7a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a02ccf0d7452bbaf8b10fd09f81805bf33be7a0e4bf5914fe4f1b6b01df48155f1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a01b2e661062c78acf0ba57638f272b7bbc63380397cff36e7ce9bf452a92f52058849d141719e4269f8f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "64458663d70db9b7068a3b24b51d74f74d8cbd6c3f7f34240077c7146e3b7044",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x64458663d70db9b7068a3b24b51d74f74d8cbd6c3f7f34240077c7146e3b7044",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064458663d70db9b7068a3b24b51d74f74d8cbd6c3f7f34240077c7146e3b7044a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a2e32da03e18deaae00b1a491405ce5ceab7b7257970224966a2ea5e0cdbfcd8",
+        "lastblockhash" : "0x9dbd137d952f0930422346a8bca39369a5d37d4cabaab2450cce9895c5dd3bb7",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -69,67 +74,67 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x04a817c800",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f548e7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762b719",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -137,36 +142,41 @@
         }
     },
     "callcodecallcallcode_101_SuicideEnd_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "03ced37585f6a018d140c2c9815c2efec77c12d7965062ac65755739b1e33544",
-                    "mixHash" : "1d5b7df6a901b1fe9aa0c6290f17b2fe312e543a87e51caf5e4aff184c95747a",
-                    "nonce" : "c4c30eb13a49ad16",
+                    "hash" : "0x97380af6958be83e8ff2b36a0264f6d0fa345c9adafe5248b4ee419414332aba",
+                    "mixHash" : "0xf3bce288d50b541ee295bfebc7964dc1fac7d062aa29d73dcb003c04651ebee5",
+                    "nonce" : "0x342117b648505029",
                     "number" : "0x01",
-                    "parentHash" : "ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
-                    "receiptTrie" : "2ccf0d7452bbaf8b10fd09f81805bf33be7a0e4bf5914fe4f1b6b01df48155f1",
-                    "stateRoot" : "541ccb3beac32c040b674f40511ebae6e213483c8c9a6609d74ea747c59ccbf7",
+                    "parentHash" : "0xef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
+                    "receiptTrie" : "0x2ccf0d7452bbaf8b10fd09f81805bf33be7a0e4bf5914fe4f1b6b01df48155f1",
+                    "stateRoot" : "0x541ccb3beac32c040b674f40511ebae6e213483c8c9a6609d74ea747c59ccbf7",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0541ccb3beac32c040b674f40511ebae6e213483c8c9a6609d74ea747c59ccbf7a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a02ccf0d7452bbaf8b10fd09f81805bf33be7a0e4bf5914fe4f1b6b01df48155f1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a01d5b7df6a901b1fe9aa0c6290f17b2fe312e543a87e51caf5e4aff184c95747a88c4c30eb13a49ad16f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0541ccb3beac32c040b674f40511ebae6e213483c8c9a6609d74ea747c59ccbf7a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a02ccf0d7452bbaf8b10fd09f81805bf33be7a0e4bf5914fe4f1b6b01df48155f1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0f3bce288d50b541ee295bfebc7964dc1fac7d062aa29d73dcb003c04651ebee588342117b648505029f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -176,28 +186,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "64458663d70db9b7068a3b24b51d74f74d8cbd6c3f7f34240077c7146e3b7044",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x64458663d70db9b7068a3b24b51d74f74d8cbd6c3f7f34240077c7146e3b7044",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064458663d70db9b7068a3b24b51d74f74d8cbd6c3f7f34240077c7146e3b7044a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "03ced37585f6a018d140c2c9815c2efec77c12d7965062ac65755739b1e33544",
+        "lastblockhash" : "0x97380af6958be83e8ff2b36a0264f6d0fa345c9adafe5248b4ee419414332aba",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -206,67 +216,67 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x04a817c800",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f548e7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762b719",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -274,36 +284,41 @@
         }
     },
     "callcodecallcallcode_101_SuicideEnd_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "fc0e48091d72e9a2199c127731d117460071c9b8a51d72020afafebac82606a8",
-                    "mixHash" : "42b8d09c03b09dea772f2003afba6d0b952ae3d698542e93128c09fe99ed9f70",
-                    "nonce" : "bdfa9e4b1f0a3de8",
+                    "hash" : "0x2c4b01a932f60491b3c3d0f8a564b3ac9f0355ea90e310be61f8e0f70ee04e82",
+                    "mixHash" : "0xd4f89d0503694a43880d2901f40a307c1351a132423924de380e0f0c6ff86346",
+                    "nonce" : "0xa902f3e111eea2aa",
                     "number" : "0x01",
-                    "parentHash" : "ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
-                    "receiptTrie" : "f0f8dfafbfc8d54c88d8bdac12f0e34a5870d083c25403ae49eb7596c70b9913",
-                    "stateRoot" : "73b172ca5cf59e5bd220e3c30f5ad4e23b87f6e18761370694502cc58bf5da7f",
+                    "parentHash" : "0xef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
+                    "receiptTrie" : "0xf0f8dfafbfc8d54c88d8bdac12f0e34a5870d083c25403ae49eb7596c70b9913",
+                    "stateRoot" : "0x73b172ca5cf59e5bd220e3c30f5ad4e23b87f6e18761370694502cc58bf5da7f",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073b172ca5cf59e5bd220e3c30f5ad4e23b87f6e18761370694502cc58bf5da7fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f0f8dfafbfc8d54c88d8bdac12f0e34a5870d083c25403ae49eb7596c70b9913b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a042b8d09c03b09dea772f2003afba6d0b952ae3d698542e93128c09fe99ed9f7088bdfa9e4b1f0a3de8f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073b172ca5cf59e5bd220e3c30f5ad4e23b87f6e18761370694502cc58bf5da7fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f0f8dfafbfc8d54c88d8bdac12f0e34a5870d083c25403ae49eb7596c70b9913b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0d4f89d0503694a43880d2901f40a307c1351a132423924de380e0f0c6ff8634688a902f3e111eea2aaf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -313,28 +328,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "64458663d70db9b7068a3b24b51d74f74d8cbd6c3f7f34240077c7146e3b7044",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x64458663d70db9b7068a3b24b51d74f74d8cbd6c3f7f34240077c7146e3b7044",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064458663d70db9b7068a3b24b51d74f74d8cbd6c3f7f34240077c7146e3b7044a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "fc0e48091d72e9a2199c127731d117460071c9b8a51d72020afafebac82606a8",
+        "lastblockhash" : "0x2c4b01a932f60491b3c3d0f8a564b3ac9f0355ea90e310be61f8e0f70ee04e82",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -343,67 +358,67 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x04a817c800",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52da3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762d25d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -411,36 +426,41 @@
         }
     },
     "callcodecallcallcode_101_SuicideEnd_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "fd78be9d488db7aed1c3bf3b2316ac56f1efb2a007aa62cbbe5d8f3167608a48",
-                    "mixHash" : "d2c1db1c2c5c4eeaefa1d8a164732b5556b3c77fa173e608f0e488cae5e7c24e",
-                    "nonce" : "7bc87d990be69595",
+                    "hash" : "0xeddd6fe26076614a379721871cf7aab636575a4d535b3318d6dbebe5bf37d297",
+                    "mixHash" : "0x6d83f5ae078c12c07b839e06c1fe644edb83cfb2b076dff1be532149da0fcf83",
+                    "nonce" : "0x3d9cda442f8b1ca3",
                     "number" : "0x01",
-                    "parentHash" : "ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
-                    "receiptTrie" : "f0f8dfafbfc8d54c88d8bdac12f0e34a5870d083c25403ae49eb7596c70b9913",
-                    "stateRoot" : "73b172ca5cf59e5bd220e3c30f5ad4e23b87f6e18761370694502cc58bf5da7f",
+                    "parentHash" : "0xef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
+                    "receiptTrie" : "0xf0f8dfafbfc8d54c88d8bdac12f0e34a5870d083c25403ae49eb7596c70b9913",
+                    "stateRoot" : "0x73b172ca5cf59e5bd220e3c30f5ad4e23b87f6e18761370694502cc58bf5da7f",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073b172ca5cf59e5bd220e3c30f5ad4e23b87f6e18761370694502cc58bf5da7fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f0f8dfafbfc8d54c88d8bdac12f0e34a5870d083c25403ae49eb7596c70b9913b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0d2c1db1c2c5c4eeaefa1d8a164732b5556b3c77fa173e608f0e488cae5e7c24e887bc87d990be69595f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073b172ca5cf59e5bd220e3c30f5ad4e23b87f6e18761370694502cc58bf5da7fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f0f8dfafbfc8d54c88d8bdac12f0e34a5870d083c25403ae49eb7596c70b9913b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a06d83f5ae078c12c07b839e06c1fe644edb83cfb2b076dff1be532149da0fcf83883d9cda442f8b1ca3f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -450,28 +470,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "64458663d70db9b7068a3b24b51d74f74d8cbd6c3f7f34240077c7146e3b7044",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x64458663d70db9b7068a3b24b51d74f74d8cbd6c3f7f34240077c7146e3b7044",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064458663d70db9b7068a3b24b51d74f74d8cbd6c3f7f34240077c7146e3b7044a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "fd78be9d488db7aed1c3bf3b2316ac56f1efb2a007aa62cbbe5d8f3167608a48",
+        "lastblockhash" : "0xeddd6fe26076614a379721871cf7aab636575a4d535b3318d6dbebe5bf37d297",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -480,67 +500,216 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x04a817c800",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52da3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762d25d",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x40a12616d5d7b0a6977900b813b0f14525097b4afbb34f683813255d7894349f",
+                    "mixHash" : "0xfdeb79d335f7395e666def02f82ff3df0d650d84124325f5826ccd53cbe36050",
+                    "nonce" : "0x21632ed09de28aab",
+                    "number" : "0x01",
+                    "parentHash" : "0xef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0x7b04799b925ea312e4f2e6b287e3f1a7d567945a432480cb0f9389ea5dc11676",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07b04799b925ea312e4f2e6b287e3f1a7d567945a432480cb0f9389ea5dc11676a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0fdeb79d335f7395e666def02f82ff3df0d650d84124325f5826ccd53cbe360508821632ed09de28aabf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x40a12616d5d7b0a6977900b813b0f14525097b4afbb34f683813255d7894349f",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle_d0g0v0.json
index 29dd208fc..1851dd9c9 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcallcode_101_SuicideMiddle_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_SuicideMiddle_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "eb16c868fd3997049b98d815b7aad528d99fa553166cf95051fd369a787e71b9",
-                    "mixHash" : "80f612605c18b0a094e5101f5e5cf91323c05fe6d4237686d0d623ee27a50b21",
-                    "nonce" : "5f5080849f92a968",
+                    "hash" : "0xc0c630a8373bc649a0519929463c2c1f38ee155a7061b87fe6a6325edfcb4102",
+                    "mixHash" : "0x403d096a04148988268a7c75463395843a81c4735c0b9582293980d3527cc7f7",
+                    "nonce" : "0xb45bd00fa1d56a2d",
                     "number" : "0x01",
-                    "parentHash" : "6703b54918c41f437dcfdbac8c05b718acd53a84bd03dce4757e78187442d729",
-                    "receiptTrie" : "5b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1",
-                    "stateRoot" : "c8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71",
+                    "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+                    "receiptTrie" : "0x5b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1",
+                    "stateRoot" : "0xc8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06703b54918c41f437dcfdbac8c05b718acd53a84bd03dce4757e78187442d729a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a080f612605c18b0a094e5101f5e5cf91323c05fe6d4237686d0d623ee27a50b21885f5080849f92a968f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0403d096a04148988268a7c75463395843a81c4735c0b9582293980d3527cc7f788b45bd00fa1d56a2df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6703b54918c41f437dcfdbac8c05b718acd53a84bd03dce4757e78187442d729",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4ab5e84c6e972e8bc12d2337b437d8ff9a44387c25c1e00b99098a8db06f9a68",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ab5e84c6e972e8bc12d2337b437d8ff9a44387c25c1e00b99098a8db06f9a68a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "eb16c868fd3997049b98d815b7aad528d99fa553166cf95051fd369a787e71b9",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc0c630a8373bc649a0519929463c2c1f38ee155a7061b87fe6a6325edfcb4102",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -69,67 +74,67 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4a9c7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7635639",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -137,36 +142,41 @@
         }
     },
     "callcodecallcallcode_101_SuicideMiddle_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_SuicideMiddle_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "161f8cf65195c87cf0bc46f06d226f775d0e7e7e32bb8937b080c3286d2daae1",
-                    "mixHash" : "29b2d4f687df5ff7e2ecb8917c6cb7f007837ab33777c11f7bfde5dd56f4cbad",
-                    "nonce" : "1946e4c8aa8aff2e",
+                    "hash" : "0xa3fa0111f60770e68818cbcaa6b484ae6edcd7559d68d20f72151c734fc993d5",
+                    "mixHash" : "0xbbb1d6da04a97567a08b96baf19e5f38bd6ebbe4f261b3805ce1c08c8c50c79e",
+                    "nonce" : "0xb0040030080de20f",
                     "number" : "0x01",
-                    "parentHash" : "6703b54918c41f437dcfdbac8c05b718acd53a84bd03dce4757e78187442d729",
-                    "receiptTrie" : "5b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1",
-                    "stateRoot" : "c8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71",
+                    "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+                    "receiptTrie" : "0x5b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1",
+                    "stateRoot" : "0xc8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06703b54918c41f437dcfdbac8c05b718acd53a84bd03dce4757e78187442d729a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a029b2d4f687df5ff7e2ecb8917c6cb7f007837ab33777c11f7bfde5dd56f4cbad881946e4c8aa8aff2ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0bbb1d6da04a97567a08b96baf19e5f38bd6ebbe4f261b3805ce1c08c8c50c79e88b0040030080de20ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -176,28 +186,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6703b54918c41f437dcfdbac8c05b718acd53a84bd03dce4757e78187442d729",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4ab5e84c6e972e8bc12d2337b437d8ff9a44387c25c1e00b99098a8db06f9a68",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ab5e84c6e972e8bc12d2337b437d8ff9a44387c25c1e00b99098a8db06f9a68a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "161f8cf65195c87cf0bc46f06d226f775d0e7e7e32bb8937b080c3286d2daae1",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa3fa0111f60770e68818cbcaa6b484ae6edcd7559d68d20f72151c734fc993d5",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -206,67 +216,67 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4a9c7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7635639",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -274,36 +284,41 @@
         }
     },
     "callcodecallcallcode_101_SuicideMiddle_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_SuicideMiddle_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9117",
-                    "hash" : "125c53ea1e6981b7d601b106cb7040f1a19bdc4d7465833ce6e93f8d38c4b11c",
-                    "mixHash" : "80b435da12213eb15a6f518e2080aafc8db51ed8b892541768f75fae360f275f",
-                    "nonce" : "e7d725baf4391d0b",
+                    "hash" : "0xf14517702b7d37ef5324fece40e61e36c00c460e38c6e97c2e5380e72e9856d7",
+                    "mixHash" : "0x299d9da5381b779c7a9aa41691f93985681e29816e870d44e9af75ce0f6f5d88",
+                    "nonce" : "0xf279b3fdc57a283b",
                     "number" : "0x01",
-                    "parentHash" : "6703b54918c41f437dcfdbac8c05b718acd53a84bd03dce4757e78187442d729",
-                    "receiptTrie" : "eec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6",
-                    "stateRoot" : "9803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306e",
+                    "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+                    "receiptTrie" : "0xeec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6",
+                    "stateRoot" : "0x9803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06703b54918c41f437dcfdbac8c05b718acd53a84bd03dce4757e78187442d729a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a080b435da12213eb15a6f518e2080aafc8db51ed8b892541768f75fae360f275f88e7d725baf4391d0bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0299d9da5381b779c7a9aa41691f93985681e29816e870d44e9af75ce0f6f5d8888f279b3fdc57a283bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -313,28 +328,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6703b54918c41f437dcfdbac8c05b718acd53a84bd03dce4757e78187442d729",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4ab5e84c6e972e8bc12d2337b437d8ff9a44387c25c1e00b99098a8db06f9a68",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ab5e84c6e972e8bc12d2337b437d8ff9a44387c25c1e00b99098a8db06f9a68a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "125c53ea1e6981b7d601b106cb7040f1a19bdc4d7465833ce6e93f8d38c4b11c",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf14517702b7d37ef5324fece40e61e36c00c460e38c6e97c2e5380e72e9856d7",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -343,67 +358,67 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f49117",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7636ee9",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -411,36 +426,41 @@
         }
     },
     "callcodecallcallcode_101_SuicideMiddle_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_SuicideMiddle_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9117",
-                    "hash" : "cd6ff1f68ca9bca5cb1ca61aa8e9555af5d4dd18d021d015feb736470a678273",
-                    "mixHash" : "b6ed59b4db9a52c2e31d8f0d2e6fcaa0e80c844c70b8c14759dfa1220b11293f",
-                    "nonce" : "946a396e17c8b33d",
+                    "hash" : "0x3d07c73f58aa4856a31f6ca0962c96d2207b2d533ab7f77d1f495497db32095f",
+                    "mixHash" : "0x4f2596023ec8560acb755fd16d641e4fe66ece6d1d64535cdd75409adf9e9a3a",
+                    "nonce" : "0x9583c81c55a4832f",
                     "number" : "0x01",
-                    "parentHash" : "6703b54918c41f437dcfdbac8c05b718acd53a84bd03dce4757e78187442d729",
-                    "receiptTrie" : "eec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6",
-                    "stateRoot" : "9803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306e",
+                    "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+                    "receiptTrie" : "0xeec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6",
+                    "stateRoot" : "0x9803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06703b54918c41f437dcfdbac8c05b718acd53a84bd03dce4757e78187442d729a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0b6ed59b4db9a52c2e31d8f0d2e6fcaa0e80c844c70b8c14759dfa1220b11293f88946a396e17c8b33df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a04f2596023ec8560acb755fd16d641e4fe66ece6d1d64535cdd75409adf9e9a3a889583c81c55a4832ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -450,28 +470,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6703b54918c41f437dcfdbac8c05b718acd53a84bd03dce4757e78187442d729",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4ab5e84c6e972e8bc12d2337b437d8ff9a44387c25c1e00b99098a8db06f9a68",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ab5e84c6e972e8bc12d2337b437d8ff9a44387c25c1e00b99098a8db06f9a68a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "cd6ff1f68ca9bca5cb1ca61aa8e9555af5d4dd18d021d015feb736470a678273",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3d07c73f58aa4856a31f6ca0962c96d2207b2d533ab7f77d1f495497db32095f",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -480,67 +500,216 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f49117",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7636ee9",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xca9566a986096c28f277035e200a55763e37fdaead3c0234a2b9fba57de0b9a0",
+                    "mixHash" : "0x443aeeef21f2760a0fe5c6e76befcf2c4ec608b324c06b5a71dc853b6403b017",
+                    "nonce" : "0x26f5d6772b16ad89",
+                    "number" : "0x01",
+                    "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0xbebbbd99c1481b46db83269271b08fb4a04310c15693e73c7086ef187b508d22",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bebbbd99c1481b46db83269271b08fb4a04310c15693e73c7086ef187b508d22a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0443aeeef21f2760a0fe5c6e76befcf2c4ec608b324c06b5a71dc853b6403b0178826f5d6772b16ad89f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xca9566a986096c28f277035e200a55763e37fdaead3c0234a2b9fba57de0b9a0",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_d0g0v0.json
index 24bcd087f..6a24d1738 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcallcode_101_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "2fcf6a4a15396310311b0dcf4774029396b468362b420f043d09acbcbba1f535",
-                    "mixHash" : "8ac3d73e13f73283d4424e60fda3c3a0b8b8f59f7c78083c7c46469eb8ef73c1",
-                    "nonce" : "6553c8b1faf8fbcf",
+                    "hash" : "0xee75c6ef3baf9a19155fa0c72c551dead763a2ebb427107b7300ae259ee40d9b",
+                    "mixHash" : "0x7c9ea2c2df029121b4dd63fa5e353e8f635f55392c089521f4ed9e4c32871150",
+                    "nonce" : "0xc8ba68dc458aba93",
                     "number" : "0x01",
-                    "parentHash" : "07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
-                    "receiptTrie" : "3e92235c7fcde08dbc6c1380d585b9aa524d8769080a7997cea6924fcdda9453",
-                    "stateRoot" : "df3d2b12b746e42dd2f4e3890485aa85a6fefecf0baa6e457ce631a22ab3ee49",
+                    "parentHash" : "0x07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
+                    "receiptTrie" : "0x3e92235c7fcde08dbc6c1380d585b9aa524d8769080a7997cea6924fcdda9453",
+                    "stateRoot" : "0xdf3d2b12b746e42dd2f4e3890485aa85a6fefecf0baa6e457ce631a22ab3ee49",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a007d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df3d2b12b746e42dd2f4e3890485aa85a6fefecf0baa6e457ce631a22ab3ee49a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03e92235c7fcde08dbc6c1380d585b9aa524d8769080a7997cea6924fcdda9453b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a08ac3d73e13f73283d4424e60fda3c3a0b8b8f59f7c78083c7c46469eb8ef73c1886553c8b1faf8fbcff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a007d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df3d2b12b746e42dd2f4e3890485aa85a6fefecf0baa6e457ce631a22ab3ee49a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03e92235c7fcde08dbc6c1380d585b9aa524d8769080a7997cea6924fcdda9453b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a07c9ea2c2df029121b4dd63fa5e353e8f635f55392c089521f4ed9e4c3287115088c8ba68dc458aba93f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "eb8982784f363701968472a1d055469ac08e0a731e753e19b8b11c4e25a294a8",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xeb8982784f363701968472a1d055469ac08e0a731e753e19b8b11c4e25a294a8",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb8982784f363701968472a1d055469ac08e0a731e753e19b8b11c4e25a294a8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2fcf6a4a15396310311b0dcf4774029396b468362b420f043d09acbcbba1f535",
+        "lastblockhash" : "0xee75c6ef3baf9a19155fa0c72c551dead763a2ebb427107b7300ae259ee40d9b",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -69,14 +74,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640002",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
@@ -92,60 +97,60 @@
                     "0x07" : "0x03"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f804a3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ffb5d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -153,36 +158,41 @@
         }
     },
     "callcodecallcallcode_101_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "63db9c29037b7e2bd80bb5aba803c5a495eb51aab1d0b2908f89b6f74c3cbacc",
-                    "mixHash" : "2f5d70979d447bf8ac7bdc02a21886231e5d88db5b29c8e95f37708d5213ef03",
-                    "nonce" : "9c04eb7d9f555e77",
+                    "hash" : "0x8e4b488c66a30f81e95aa969b9cd1eccc9b37157cea2b30b9e484e7f6f5d6919",
+                    "mixHash" : "0x25e89c701dea2d4b3ac6881d1f3bf28ac2d31c487cc14d927594f495207fbb05",
+                    "nonce" : "0xafc993f97ac00f8c",
                     "number" : "0x01",
-                    "parentHash" : "07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
-                    "receiptTrie" : "3e92235c7fcde08dbc6c1380d585b9aa524d8769080a7997cea6924fcdda9453",
-                    "stateRoot" : "df3d2b12b746e42dd2f4e3890485aa85a6fefecf0baa6e457ce631a22ab3ee49",
+                    "parentHash" : "0x07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
+                    "receiptTrie" : "0x3e92235c7fcde08dbc6c1380d585b9aa524d8769080a7997cea6924fcdda9453",
+                    "stateRoot" : "0xdf3d2b12b746e42dd2f4e3890485aa85a6fefecf0baa6e457ce631a22ab3ee49",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a007d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df3d2b12b746e42dd2f4e3890485aa85a6fefecf0baa6e457ce631a22ab3ee49a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03e92235c7fcde08dbc6c1380d585b9aa524d8769080a7997cea6924fcdda9453b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a02f5d70979d447bf8ac7bdc02a21886231e5d88db5b29c8e95f37708d5213ef03889c04eb7d9f555e77f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a007d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df3d2b12b746e42dd2f4e3890485aa85a6fefecf0baa6e457ce631a22ab3ee49a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03e92235c7fcde08dbc6c1380d585b9aa524d8769080a7997cea6924fcdda9453b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a025e89c701dea2d4b3ac6881d1f3bf28ac2d31c487cc14d927594f495207fbb0588afc993f97ac00f8cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -192,28 +202,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "eb8982784f363701968472a1d055469ac08e0a731e753e19b8b11c4e25a294a8",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xeb8982784f363701968472a1d055469ac08e0a731e753e19b8b11c4e25a294a8",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb8982784f363701968472a1d055469ac08e0a731e753e19b8b11c4e25a294a8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "63db9c29037b7e2bd80bb5aba803c5a495eb51aab1d0b2908f89b6f74c3cbacc",
+        "lastblockhash" : "0x8e4b488c66a30f81e95aa969b9cd1eccc9b37157cea2b30b9e484e7f6f5d6919",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -222,14 +232,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640002",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
@@ -245,60 +255,60 @@
                     "0x07" : "0x03"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f804a3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ffb5d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -306,36 +316,41 @@
         }
     },
     "callcodecallcallcode_101_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "9bf6dfac5ece62afb343c20ed4e7183bcb7a31a0f86fc530baba00957cca27c7",
-                    "mixHash" : "62a25066085975cf3ab81755d0076419bbfc617b08e5c79335a780cd94653629",
-                    "nonce" : "140d1baed97ae8f0",
+                    "hash" : "0x83a8e0a8cf89a228b7a335d36d1b93591edc554652a193e4289076d8c15690cb",
+                    "mixHash" : "0xcf0263d6898498315b27d530f1ff214bfe7385f2a083731b220d0e2f442997cb",
+                    "nonce" : "0xe763ca3e02283f0d",
                     "number" : "0x01",
-                    "parentHash" : "07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
-                    "receiptTrie" : "1fbd214332417a6af0024b4b0a08edfbc9906c2b51ae6d774aac9a1916bd23cc",
-                    "stateRoot" : "65c204badda1ce7bd62798ca23f2be47a5a5b5a9183ae840289875bb0b5c8a8c",
+                    "parentHash" : "0x07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
+                    "receiptTrie" : "0x1fbd214332417a6af0024b4b0a08edfbc9906c2b51ae6d774aac9a1916bd23cc",
+                    "stateRoot" : "0x65c204badda1ce7bd62798ca23f2be47a5a5b5a9183ae840289875bb0b5c8a8c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a007d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa065c204badda1ce7bd62798ca23f2be47a5a5b5a9183ae840289875bb0b5c8a8ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01fbd214332417a6af0024b4b0a08edfbc9906c2b51ae6d774aac9a1916bd23ccb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a062a25066085975cf3ab81755d0076419bbfc617b08e5c79335a780cd9465362988140d1baed97ae8f0f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a007d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa065c204badda1ce7bd62798ca23f2be47a5a5b5a9183ae840289875bb0b5c8a8ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01fbd214332417a6af0024b4b0a08edfbc9906c2b51ae6d774aac9a1916bd23ccb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0cf0263d6898498315b27d530f1ff214bfe7385f2a083731b220d0e2f442997cb88e763ca3e02283f0df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -345,28 +360,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "eb8982784f363701968472a1d055469ac08e0a731e753e19b8b11c4e25a294a8",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xeb8982784f363701968472a1d055469ac08e0a731e753e19b8b11c4e25a294a8",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb8982784f363701968472a1d055469ac08e0a731e753e19b8b11c4e25a294a8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9bf6dfac5ece62afb343c20ed4e7183bcb7a31a0f86fc530baba00957cca27c7",
+        "lastblockhash" : "0x83a8e0a8cf89a228b7a335d36d1b93591edc554652a193e4289076d8c15690cb",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -375,14 +390,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640002",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
@@ -398,60 +413,60 @@
                     "0x07" : "0x03"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7fce7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7600319",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -459,36 +474,41 @@
         }
     },
     "callcodecallcallcode_101_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "e75476f7a3d03db88640df32327f05f869181e56b943ce757e2222970c309283",
-                    "mixHash" : "eb86744773240f6950d43ef46d31a5dd0392f5052775803bcf5970b0eeba67af",
-                    "nonce" : "68ccace10cd3e43c",
+                    "hash" : "0x3f69cf64193b2d4aa5e35713061fa540137ec28c910da66e7d3f2cdd0379c953",
+                    "mixHash" : "0x33a666530a4c6cee73dd3a531d7acd97c65006dfb7eea70024a181bd08cd7fbe",
+                    "nonce" : "0x37cc4b0e44e3212b",
                     "number" : "0x01",
-                    "parentHash" : "07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
-                    "receiptTrie" : "1fbd214332417a6af0024b4b0a08edfbc9906c2b51ae6d774aac9a1916bd23cc",
-                    "stateRoot" : "65c204badda1ce7bd62798ca23f2be47a5a5b5a9183ae840289875bb0b5c8a8c",
+                    "parentHash" : "0x07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
+                    "receiptTrie" : "0x1fbd214332417a6af0024b4b0a08edfbc9906c2b51ae6d774aac9a1916bd23cc",
+                    "stateRoot" : "0x65c204badda1ce7bd62798ca23f2be47a5a5b5a9183ae840289875bb0b5c8a8c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a007d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa065c204badda1ce7bd62798ca23f2be47a5a5b5a9183ae840289875bb0b5c8a8ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01fbd214332417a6af0024b4b0a08edfbc9906c2b51ae6d774aac9a1916bd23ccb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0eb86744773240f6950d43ef46d31a5dd0392f5052775803bcf5970b0eeba67af8868ccace10cd3e43cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a007d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa065c204badda1ce7bd62798ca23f2be47a5a5b5a9183ae840289875bb0b5c8a8ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01fbd214332417a6af0024b4b0a08edfbc9906c2b51ae6d774aac9a1916bd23ccb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a033a666530a4c6cee73dd3a531d7acd97c65006dfb7eea70024a181bd08cd7fbe8837cc4b0e44e3212bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -498,28 +518,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "eb8982784f363701968472a1d055469ac08e0a731e753e19b8b11c4e25a294a8",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xeb8982784f363701968472a1d055469ac08e0a731e753e19b8b11c4e25a294a8",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb8982784f363701968472a1d055469ac08e0a731e753e19b8b11c4e25a294a8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e75476f7a3d03db88640df32327f05f869181e56b943ce757e2222970c309283",
+        "lastblockhash" : "0x3f69cf64193b2d4aa5e35713061fa540137ec28c910da66e7d3f2cdd0379c953",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -528,14 +548,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640002",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
@@ -551,60 +571,225 @@
                     "0x07" : "0x03"
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7fce7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7600319",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0xe2652eead9d248ecb17c7fed03211c1a04fbba180dffea0106652520c3feb007",
+                    "mixHash" : "0x7e729d7a09ab24a499076d34cdd0f8431accf867f176f271a1889e6a0ecefb9d",
+                    "nonce" : "0xcbc1ab0db3154d9c",
+                    "number" : "0x01",
+                    "parentHash" : "0x07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0x7680b656fb2d8b070e2213e3d7115c22b9cde0a949a387ba693bdf1e8e4eaeff",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a007d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07680b656fb2d8b070e2213e3d7115c22b9cde0a949a387ba693bdf1e8e4eaeffa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a07e729d7a09ab24a499076d34cdd0f8431accf867f176f271a1889e6a0ecefb9d88cbc1ab0db3154d9cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xe2652eead9d248ecb17c7fed03211c1a04fbba180dffea0106652520c3feb007",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0.json
index a39bb3ce2..531223353 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcallcode_ABCB_RECURSIVE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "bd194ac151085a283dbeeadffb65d736e03ecb2b35a5cdea1763c9c9036ca2ab",
-                    "mixHash" : "8165677d61d102eb6c3f994cf6b03a2f3052cbd74f3e2614cb079f024ba358f9",
-                    "nonce" : "bf111ac8d5f74462",
+                    "hash" : "0xa0e32b24a4cf22eb6da84dca126fd8c655c723aa86cc2136d478f904115d5ad1",
+                    "mixHash" : "0x9e7f7414143151cf1f914e1f81637ba2a4d29f4f860528f1517f9844a7b3a0fb",
+                    "nonce" : "0x54f7b08eae5cf9e7",
                     "number" : "0x01",
-                    "parentHash" : "4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
-                    "receiptTrie" : "d6f242a48de75d3a8bca6ff1ffa5a6cbb903c09ac072da6a734b244e480c4382",
-                    "stateRoot" : "fc7d7137077a00a4a223bc6f063748f041055e53aefc85782ee2ae5e06a63a3b",
+                    "parentHash" : "0x4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
+                    "receiptTrie" : "0xd6f242a48de75d3a8bca6ff1ffa5a6cbb903c09ac072da6a734b244e480c4382",
+                    "stateRoot" : "0xfc7d7137077a00a4a223bc6f063748f041055e53aefc85782ee2ae5e06a63a3b",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a04681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc7d7137077a00a4a223bc6f063748f041055e53aefc85782ee2ae5e06a63a3ba06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0d6f242a48de75d3a8bca6ff1ffa5a6cbb903c09ac072da6a734b244e480c4382b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a08165677d61d102eb6c3f994cf6b03a2f3052cbd74f3e2614cb079f024ba358f988bf111ac8d5f74462f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a04681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc7d7137077a00a4a223bc6f063748f041055e53aefc85782ee2ae5e06a63a3ba06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0d6f242a48de75d3a8bca6ff1ffa5a6cbb903c09ac072da6a734b244e480c4382b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a09e7f7414143151cf1f914e1f81637ba2a4d29f4f860528f1517f9844a7b3a0fb8854f7b08eae5cf9e7f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f5c007588caeb0a5319c1be78c0c0b68d6d9e363a095e4d76c621e5483947e11",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf5c007588caeb0a5319c1be78c0c0b68d6d9e363a095e4d76c621e5483947e11",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5c007588caeb0a5319c1be78c0c0b68d6d9e363a095e4d76c621e5483947e11a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "bd194ac151085a283dbeeadffb65d736e03ecb2b35a5cdea1763c9c9036ca2ab",
+        "lastblockhash" : "0xa0e32b24a4cf22eb6da84dca126fd8c655c723aa86cc2136d478f904115d5ad1",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
@@ -69,60 +74,60 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fcab7e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5482",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -130,36 +135,41 @@
         }
     },
     "callcodecallcallcode_ABCB_RECURSIVE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "0a851b1be52d0764df196403760fe2b3f3f5f4fc5ef98b87525444cae6069f90",
-                    "mixHash" : "a74eb3a5db77f17f9067f43ae6de25f5bd0e57961ff4db94ad9b35d5be7fea43",
-                    "nonce" : "8ed02978dca70a7d",
+                    "hash" : "0x1bbabb3a262d15f09babc4c1fa551a69db92f8b346e3ace4c690e06f5f3188c2",
+                    "mixHash" : "0xa83f7939439f6beb137bd67e728416ca41136fd52fa416f7c562a06431ebc594",
+                    "nonce" : "0x0e54bea992832777",
                     "number" : "0x01",
-                    "parentHash" : "4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
-                    "receiptTrie" : "d6f242a48de75d3a8bca6ff1ffa5a6cbb903c09ac072da6a734b244e480c4382",
-                    "stateRoot" : "fc7d7137077a00a4a223bc6f063748f041055e53aefc85782ee2ae5e06a63a3b",
+                    "parentHash" : "0x4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
+                    "receiptTrie" : "0xd6f242a48de75d3a8bca6ff1ffa5a6cbb903c09ac072da6a734b244e480c4382",
+                    "stateRoot" : "0xfc7d7137077a00a4a223bc6f063748f041055e53aefc85782ee2ae5e06a63a3b",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a04681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc7d7137077a00a4a223bc6f063748f041055e53aefc85782ee2ae5e06a63a3ba06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0d6f242a48de75d3a8bca6ff1ffa5a6cbb903c09ac072da6a734b244e480c4382b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0a74eb3a5db77f17f9067f43ae6de25f5bd0e57961ff4db94ad9b35d5be7fea43888ed02978dca70a7df863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a04681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc7d7137077a00a4a223bc6f063748f041055e53aefc85782ee2ae5e06a63a3ba06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0d6f242a48de75d3a8bca6ff1ffa5a6cbb903c09ac072da6a734b244e480c4382b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0a83f7939439f6beb137bd67e728416ca41136fd52fa416f7c562a06431ebc594880e54bea992832777f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -169,28 +179,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f5c007588caeb0a5319c1be78c0c0b68d6d9e363a095e4d76c621e5483947e11",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf5c007588caeb0a5319c1be78c0c0b68d6d9e363a095e4d76c621e5483947e11",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5c007588caeb0a5319c1be78c0c0b68d6d9e363a095e4d76c621e5483947e11a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0a851b1be52d0764df196403760fe2b3f3f5f4fc5ef98b87525444cae6069f90",
+        "lastblockhash" : "0x1bbabb3a262d15f09babc4c1fa551a69db92f8b346e3ace4c690e06f5f3188c2",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
@@ -199,60 +209,60 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fcab7e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5482",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -260,36 +270,41 @@
         }
     },
     "callcodecallcallcode_ABCB_RECURSIVE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "4a427144d82980c434d9ffa03377fbb9011eeff721c93bde8ddfb4de3098e8af",
-                    "mixHash" : "0791ff2d2d4c42a666879e99e39bffcb4a1930e5245b0d96205d9efef2016dca",
-                    "nonce" : "35d4506ac8c3262d",
+                    "hash" : "0xddb1334da84da41cb1927559e588fff31fbe1297299e59e232c0d24e2ce2ae74",
+                    "mixHash" : "0x78b93225f5cccad96ab93514b58d63b6bec12b8ab37c713a90f4856dd4663a50",
+                    "nonce" : "0x8a2dbae41fc84fea",
                     "number" : "0x01",
-                    "parentHash" : "4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
-                    "receiptTrie" : "77531219a32f72468802bc385b1fcf932da48fc010ee55ed577ffb015d800a5d",
-                    "stateRoot" : "2afcdf013ab74e1a1b3fadfbcc55490a056eab2df2af0fcbce99e7296c82b505",
+                    "parentHash" : "0x4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
+                    "receiptTrie" : "0x77531219a32f72468802bc385b1fcf932da48fc010ee55ed577ffb015d800a5d",
+                    "stateRoot" : "0x2afcdf013ab74e1a1b3fadfbcc55490a056eab2df2af0fcbce99e7296c82b505",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a04681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02afcdf013ab74e1a1b3fadfbcc55490a056eab2df2af0fcbce99e7296c82b505a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a077531219a32f72468802bc385b1fcf932da48fc010ee55ed577ffb015d800a5db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a00791ff2d2d4c42a666879e99e39bffcb4a1930e5245b0d96205d9efef2016dca8835d4506ac8c3262df863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a04681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02afcdf013ab74e1a1b3fadfbcc55490a056eab2df2af0fcbce99e7296c82b505a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a077531219a32f72468802bc385b1fcf932da48fc010ee55ed577ffb015d800a5db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a078b93225f5cccad96ab93514b58d63b6bec12b8ab37c713a90f4856dd4663a50888a2dbae41fc84feaf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -299,28 +314,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f5c007588caeb0a5319c1be78c0c0b68d6d9e363a095e4d76c621e5483947e11",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf5c007588caeb0a5319c1be78c0c0b68d6d9e363a095e4d76c621e5483947e11",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5c007588caeb0a5319c1be78c0c0b68d6d9e363a095e4d76c621e5483947e11a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4a427144d82980c434d9ffa03377fbb9011eeff721c93bde8ddfb4de3098e8af",
+        "lastblockhash" : "0xddb1334da84da41cb1927559e588fff31fbe1297299e59e232c0d24e2ce2ae74",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
@@ -329,60 +344,60 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fca3c2",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5c3e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -390,36 +405,41 @@
         }
     },
     "callcodecallcallcode_ABCB_RECURSIVE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "fb08cae0c12f54fd51f3e8badc83f05ce6d772954d6d9d137cacd050f7b1a15e",
-                    "mixHash" : "3cb488d88ffcf9c5d495d3150704bc7cbb657c1b3461275f5a967fbe203e62bc",
-                    "nonce" : "8cee249b7116b9ca",
+                    "hash" : "0x7599e26e8f165ec82d3da3041ad9c20dd219ab6abb7b3a7e1d238a1db457fd71",
+                    "mixHash" : "0xbfcb50ca9b79e03c7c940baac6f033262856919bb157574a3abd0a5010b75fe2",
+                    "nonce" : "0x9e1d3ed06e1f201e",
                     "number" : "0x01",
-                    "parentHash" : "4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
-                    "receiptTrie" : "77531219a32f72468802bc385b1fcf932da48fc010ee55ed577ffb015d800a5d",
-                    "stateRoot" : "2afcdf013ab74e1a1b3fadfbcc55490a056eab2df2af0fcbce99e7296c82b505",
+                    "parentHash" : "0x4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
+                    "receiptTrie" : "0x77531219a32f72468802bc385b1fcf932da48fc010ee55ed577ffb015d800a5d",
+                    "stateRoot" : "0x2afcdf013ab74e1a1b3fadfbcc55490a056eab2df2af0fcbce99e7296c82b505",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a04681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02afcdf013ab74e1a1b3fadfbcc55490a056eab2df2af0fcbce99e7296c82b505a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a077531219a32f72468802bc385b1fcf932da48fc010ee55ed577ffb015d800a5db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a03cb488d88ffcf9c5d495d3150704bc7cbb657c1b3461275f5a967fbe203e62bc888cee249b7116b9caf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a04681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02afcdf013ab74e1a1b3fadfbcc55490a056eab2df2af0fcbce99e7296c82b505a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a077531219a32f72468802bc385b1fcf932da48fc010ee55ed577ffb015d800a5db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0bfcb50ca9b79e03c7c940baac6f033262856919bb157574a3abd0a5010b75fe2889e1d3ed06e1f201ef863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -429,28 +449,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f5c007588caeb0a5319c1be78c0c0b68d6d9e363a095e4d76c621e5483947e11",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf5c007588caeb0a5319c1be78c0c0b68d6d9e363a095e4d76c621e5483947e11",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5c007588caeb0a5319c1be78c0c0b68d6d9e363a095e4d76c621e5483947e11a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "fb08cae0c12f54fd51f3e8badc83f05ce6d772954d6d9d137cacd050f7b1a15e",
+        "lastblockhash" : "0x7599e26e8f165ec82d3da3041ad9c20dd219ab6abb7b3a7e1d238a1db457fd71",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
@@ -459,60 +479,202 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fca3c2",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5c3e",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x89b0a3c2d8d851ff620be6e5761f252cbb0793d55f094e9fd2d2aa820bc7fdbd",
+                    "mixHash" : "0x3eb8b9ce1f2f31ecdb05b100739e25359c2c1c0380903955615ee58603bad69c",
+                    "nonce" : "0x29b8082854bf510c",
+                    "number" : "0x01",
+                    "parentHash" : "0x4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0xfbf835b13f8fb544cb6976cc34a1790451d4e61bf8d00d1d097d591968590d87",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a04681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbf835b13f8fb544cb6976cc34a1790451d4e61bf8d00d1d097d591968590d87a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a03eb8b9ce1f2f31ecdb05b100739e25359c2c1c0380903955615ee58603bad69c8829b8082854bf510cf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "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" : "0x89b0a3c2d8d851ff620be6e5761f252cbb0793d55f094e9fd2d2aa820bc7fdbd",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE_d0g0v0.json
index 05919d170..7761932a7 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcode_11_OOGE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcode_11_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010798",
-                    "hash" : "79e89910192fac198a9e47a0cee153be557ea6c31ae7ef932212a8324783e9f9",
-                    "mixHash" : "c932cd749d2e88d1563ebff6b068ffdbfdc7e3bdf8e2590c12ac11c3c4a6b41b",
-                    "nonce" : "91890e727e126f01",
+                    "hash" : "0xf2bb91dada9dd089231e3d504cdbd498516bf19643331ecf74bca93ae6adb734",
+                    "mixHash" : "0x672d596620e370ea1e3419bb331309a2649ca3d0a0c9eea2f2625a4c71b018d5",
+                    "nonce" : "0x6ebe08f4f2b63e49",
                     "number" : "0x01",
-                    "parentHash" : "16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
-                    "receiptTrie" : "ad220872c50d0045fe32b6b3216956a56b39c2637f3df3a921cc4f3268721837",
-                    "stateRoot" : "db4ede1864b9058d891f415e37aa3b34c09f63fe033bcf1728c7945514f8a314",
+                    "parentHash" : "0x16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
+                    "receiptTrie" : "0xad220872c50d0045fe32b6b3216956a56b39c2637f3df3a921cc4f3268721837",
+                    "stateRoot" : "0xdb4ede1864b9058d891f415e37aa3b34c09f63fe033bcf1728c7945514f8a314",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a016bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db4ede1864b9058d891f415e37aa3b34c09f63fe033bcf1728c7945514f8a314a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ad220872c50d0045fe32b6b3216956a56b39c2637f3df3a921cc4f3268721837b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0c932cd749d2e88d1563ebff6b068ffdbfdc7e3bdf8e2590c12ac11c3c4a6b41b8891890e727e126f01f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a016bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db4ede1864b9058d891f415e37aa3b34c09f63fe033bcf1728c7945514f8a314a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ad220872c50d0045fe32b6b3216956a56b39c2637f3df3a921cc4f3268721837b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0672d596620e370ea1e3419bb331309a2649ca3d0a0c9eea2f2625a4c71b018d5886ebe08f4f2b63e49f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "2ecbc687c2e625609d36f46087ff00c7031395a09f7d3d3f240a22e480f5d6da",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2ecbc687c2e625609d36f46087ff00c7031395a09f7d3d3f240a22e480f5d6da",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ecbc687c2e625609d36f46087ff00c7031395a09f7d3d3f240a22e480f5d6daa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "79e89910192fac198a9e47a0cee153be557ea6c31ae7ef932212a8324783e9f9",
+        "lastblockhash" : "0xf2bb91dada9dd089231e3d504cdbd498516bf19643331ecf74bca93ae6adb734",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -68,60 +73,60 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f50798",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762f868",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -129,36 +134,41 @@
         }
     },
     "callcodecallcode_11_OOGE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcode_11_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010798",
-                    "hash" : "bc301e4c4de7c23f6921be623f05bc517d732257a98d7715ce0cdc8bca20da8a",
-                    "mixHash" : "cdf575e707535a7e4f6fbe7fc801e374fa40b180c07fbc2058a2878c4b31220e",
-                    "nonce" : "4ddef70fb61373af",
+                    "hash" : "0xde0b339f7261b9d587565c474825904e17c5f8a2bc6c24f687cbd6e7958e5de6",
+                    "mixHash" : "0x17615f1bed183bf8ce3c0c13ed389d144e8dc30277608e9f56ec766db2af466b",
+                    "nonce" : "0x2d0204950ca4cf26",
                     "number" : "0x01",
-                    "parentHash" : "16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
-                    "receiptTrie" : "ad220872c50d0045fe32b6b3216956a56b39c2637f3df3a921cc4f3268721837",
-                    "stateRoot" : "db4ede1864b9058d891f415e37aa3b34c09f63fe033bcf1728c7945514f8a314",
+                    "parentHash" : "0x16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
+                    "receiptTrie" : "0xad220872c50d0045fe32b6b3216956a56b39c2637f3df3a921cc4f3268721837",
+                    "stateRoot" : "0xdb4ede1864b9058d891f415e37aa3b34c09f63fe033bcf1728c7945514f8a314",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a016bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db4ede1864b9058d891f415e37aa3b34c09f63fe033bcf1728c7945514f8a314a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ad220872c50d0045fe32b6b3216956a56b39c2637f3df3a921cc4f3268721837b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0cdf575e707535a7e4f6fbe7fc801e374fa40b180c07fbc2058a2878c4b31220e884ddef70fb61373aff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a016bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db4ede1864b9058d891f415e37aa3b34c09f63fe033bcf1728c7945514f8a314a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ad220872c50d0045fe32b6b3216956a56b39c2637f3df3a921cc4f3268721837b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a017615f1bed183bf8ce3c0c13ed389d144e8dc30277608e9f56ec766db2af466b882d0204950ca4cf26f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -168,28 +178,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "2ecbc687c2e625609d36f46087ff00c7031395a09f7d3d3f240a22e480f5d6da",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2ecbc687c2e625609d36f46087ff00c7031395a09f7d3d3f240a22e480f5d6da",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ecbc687c2e625609d36f46087ff00c7031395a09f7d3d3f240a22e480f5d6daa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "bc301e4c4de7c23f6921be623f05bc517d732257a98d7715ce0cdc8bca20da8a",
+        "lastblockhash" : "0xde0b339f7261b9d587565c474825904e17c5f8a2bc6c24f687cbd6e7958e5de6",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -197,60 +207,60 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f50798",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762f868",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -258,36 +268,41 @@
         }
     },
     "callcodecallcode_11_OOGE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcode_11_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010270",
-                    "hash" : "f7099807cbfc3b089679c61a3537d5a359357482269b839573fcb11f85d586d4",
-                    "mixHash" : "9122b6dcf7af86fadb808f3c335c0e8fecaada7def4c3fcd1b7264556a7b874c",
-                    "nonce" : "928fc53f13ca56b6",
+                    "hash" : "0x5370e5c8a9aaece7c309776253be50fe6b364aa42ca311b2023c927e5139e401",
+                    "mixHash" : "0x7a261e4bac8a433f55e6b81a19ad5ef970135a28276df34200a008c78ed01033",
+                    "nonce" : "0x6b226a528335346e",
                     "number" : "0x01",
-                    "parentHash" : "16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
-                    "receiptTrie" : "03216b12c323d637ba1554221bf6599d1fbc361bb9c0c55666b85347ca46b6ce",
-                    "stateRoot" : "202af989c5b975bf62485eee13f1c5348bf1243d5728aa9a7896fe5a3856c3d0",
+                    "parentHash" : "0x16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
+                    "receiptTrie" : "0x03216b12c323d637ba1554221bf6599d1fbc361bb9c0c55666b85347ca46b6ce",
+                    "stateRoot" : "0x202af989c5b975bf62485eee13f1c5348bf1243d5728aa9a7896fe5a3856c3d0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a016bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0202af989c5b975bf62485eee13f1c5348bf1243d5728aa9a7896fe5a3856c3d0a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea003216b12c323d637ba1554221bf6599d1fbc361bb9c0c55666b85347ca46b6ceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a09122b6dcf7af86fadb808f3c335c0e8fecaada7def4c3fcd1b7264556a7b874c88928fc53f13ca56b6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a016bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0202af989c5b975bf62485eee13f1c5348bf1243d5728aa9a7896fe5a3856c3d0a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea003216b12c323d637ba1554221bf6599d1fbc361bb9c0c55666b85347ca46b6ceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a07a261e4bac8a433f55e6b81a19ad5ef970135a28276df34200a008c78ed01033886b226a528335346ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -297,28 +312,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "2ecbc687c2e625609d36f46087ff00c7031395a09f7d3d3f240a22e480f5d6da",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2ecbc687c2e625609d36f46087ff00c7031395a09f7d3d3f240a22e480f5d6da",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ecbc687c2e625609d36f46087ff00c7031395a09f7d3d3f240a22e480f5d6daa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f7099807cbfc3b089679c61a3537d5a359357482269b839573fcb11f85d586d4",
+        "lastblockhash" : "0x5370e5c8a9aaece7c309776253be50fe6b364aa42ca311b2023c927e5139e401",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -326,60 +341,60 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f50270",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762fd90",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -387,36 +402,41 @@
         }
     },
     "callcodecallcode_11_OOGE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcode_11_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010270",
-                    "hash" : "14c6512f8c46ec68938105b7c18e194a51a77b5b2b2d68006bfb1cb76ed5cd12",
-                    "mixHash" : "1fa5fc8b082d3b5f6c7d5832ff71a9212877e710cff619040f19473a25698d64",
-                    "nonce" : "61c321a9e1cd0ec1",
+                    "hash" : "0xf4dd5b414234cac816b1d1796a82e9371403280a993b3f0784c4eef41f698ef3",
+                    "mixHash" : "0xfad08b65740c94b9c82ca2a58291440b83a9c8864fa90c28415fb374a37de521",
+                    "nonce" : "0xc2466e9faea4679e",
                     "number" : "0x01",
-                    "parentHash" : "16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
-                    "receiptTrie" : "03216b12c323d637ba1554221bf6599d1fbc361bb9c0c55666b85347ca46b6ce",
-                    "stateRoot" : "202af989c5b975bf62485eee13f1c5348bf1243d5728aa9a7896fe5a3856c3d0",
+                    "parentHash" : "0x16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
+                    "receiptTrie" : "0x03216b12c323d637ba1554221bf6599d1fbc361bb9c0c55666b85347ca46b6ce",
+                    "stateRoot" : "0x202af989c5b975bf62485eee13f1c5348bf1243d5728aa9a7896fe5a3856c3d0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a016bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0202af989c5b975bf62485eee13f1c5348bf1243d5728aa9a7896fe5a3856c3d0a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea003216b12c323d637ba1554221bf6599d1fbc361bb9c0c55666b85347ca46b6ceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a01fa5fc8b082d3b5f6c7d5832ff71a9212877e710cff619040f19473a25698d648861c321a9e1cd0ec1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a016bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0202af989c5b975bf62485eee13f1c5348bf1243d5728aa9a7896fe5a3856c3d0a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea003216b12c323d637ba1554221bf6599d1fbc361bb9c0c55666b85347ca46b6ceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a0fad08b65740c94b9c82ca2a58291440b83a9c8864fa90c28415fb374a37de52188c2466e9faea4679ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -426,28 +446,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "2ecbc687c2e625609d36f46087ff00c7031395a09f7d3d3f240a22e480f5d6da",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2ecbc687c2e625609d36f46087ff00c7031395a09f7d3d3f240a22e480f5d6da",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ecbc687c2e625609d36f46087ff00c7031395a09f7d3d3f240a22e480f5d6daa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "14c6512f8c46ec68938105b7c18e194a51a77b5b2b2d68006bfb1cb76ed5cd12",
+        "lastblockhash" : "0xf4dd5b414234cac816b1d1796a82e9371403280a993b3f0784c4eef41f698ef3",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -455,60 +475,201 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f50270",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762fd90",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x73e840e283edd31c826dbdb0f510e0c403ff9e230b57eedcb938076d0f6d7608",
+                    "mixHash" : "0x5389f6e0fa7ef599b287db74467f0dc5f89a60d3ee28b6c7729decce93fcf5e7",
+                    "nonce" : "0xc3c9b257f24fe3a1",
+                    "number" : "0x01",
+                    "parentHash" : "0x16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
+                    "receiptTrie" : "0xfca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834",
+                    "stateRoot" : "0x674fdca1e2caa12e7e3599b4916fd3d7311c6613754bc55b0aa8c24d15702a19",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a016bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0674fdca1e2caa12e7e3599b4916fd3d7311c6613754bc55b0aa8c24d15702a19a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a05389f6e0fa7ef599b287db74467f0dc5f89a60d3ee28b6c7729decce93fcf5e788c3c9b257f24fe3a1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0x73e840e283edd31c826dbdb0f510e0c403ff9e230b57eedcb938076d0f6d7608",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0.json
index 6d7fa7a76..51e863ed7 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcode_11_SuicideEnd_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ed",
-                    "hash" : "daf1c371ff5a30f029a2f2d20280923601fc39a81ad7fc03deabe4dd9da98f48",
-                    "mixHash" : "7817b0605aeeac7fd681d62eedaf3dba34d66529a44204ce5314c6de26f20c4a",
-                    "nonce" : "2e7462d1fef04eb3",
+                    "hash" : "0x07465001497f4cfb8a1703bbf83afd0293c83842d1b1c2d7ca861c07141d20e4",
+                    "mixHash" : "0x122ac8bb4d5186723ae4e19f8b83a7123d99ad74d1bbc330f68cf8833da12038",
+                    "nonce" : "0x85c7d328a10375ab",
                     "number" : "0x01",
-                    "parentHash" : "cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
-                    "receiptTrie" : "74a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3",
-                    "stateRoot" : "545f2d8370a08d0da9fc243f586b9dc36c117ef3ebcdf8498d4f7605a1857335",
+                    "parentHash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
+                    "receiptTrie" : "0x74a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3",
+                    "stateRoot" : "0x545f2d8370a08d0da9fc243f586b9dc36c117ef3ebcdf8498d4f7605a1857335",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0545f2d8370a08d0da9fc243f586b9dc36c117ef3ebcdf8498d4f7605a1857335a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a074a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a07817b0605aeeac7fd681d62eedaf3dba34d66529a44204ce5314c6de26f20c4a882e7462d1fef04eb3f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0545f2d8370a08d0da9fc243f586b9dc36c117ef3ebcdf8498d4f7605a1857335a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a074a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0122ac8bb4d5186723ae4e19f8b83a7123d99ad74d1bbc330f68cf8833da120388885c7d328a10375abf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,81 +44,81 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "daf1c371ff5a30f029a2f2d20280923601fc39a81ad7fc03deabe4dd9da98f48",
+        "lastblockhash" : "0x07465001497f4cfb8a1703bbf83afd0293c83842d1b1c2d7ca861c07141d20e4",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f7ed",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7630813",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -121,36 +126,41 @@
         }
     },
     "callcodecallcode_11_SuicideEnd_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ed",
-                    "hash" : "47ba03dfda86240b4d0de67591fdf4e21812be9524e2259de120676a2ba18d22",
-                    "mixHash" : "d2ba6ac7de28317000a4a026abc964fdc7dee026a1930f7b442703e89da2901c",
-                    "nonce" : "32708461fdc77a72",
+                    "hash" : "0x343e723007b5fdc0174ffcaf65941ecc9985c1400edbaa3544188c81019e6933",
+                    "mixHash" : "0xfa307f9d157bb051547b0b1a24251f83192788ca209e6c57dc675895cfb9e165",
+                    "nonce" : "0xadc9bed94ef7d796",
                     "number" : "0x01",
-                    "parentHash" : "cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
-                    "receiptTrie" : "74a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3",
-                    "stateRoot" : "545f2d8370a08d0da9fc243f586b9dc36c117ef3ebcdf8498d4f7605a1857335",
+                    "parentHash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
+                    "receiptTrie" : "0x74a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3",
+                    "stateRoot" : "0x545f2d8370a08d0da9fc243f586b9dc36c117ef3ebcdf8498d4f7605a1857335",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0545f2d8370a08d0da9fc243f586b9dc36c117ef3ebcdf8498d4f7605a1857335a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a074a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0d2ba6ac7de28317000a4a026abc964fdc7dee026a1930f7b442703e89da2901c8832708461fdc77a72f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0545f2d8370a08d0da9fc243f586b9dc36c117ef3ebcdf8498d4f7605a1857335a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a074a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0fa307f9d157bb051547b0b1a24251f83192788ca209e6c57dc675895cfb9e16588adc9bed94ef7d796f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -160,81 +170,81 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "47ba03dfda86240b4d0de67591fdf4e21812be9524e2259de120676a2ba18d22",
+        "lastblockhash" : "0x343e723007b5fdc0174ffcaf65941ecc9985c1400edbaa3544188c81019e6933",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f7ed",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7630813",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -242,36 +252,41 @@
         }
     },
     "callcodecallcode_11_SuicideEnd_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xdf3d",
-                    "hash" : "946e964ca8a0f3406022038511088e46ef3983dbaa9164845639e4a539a1449d",
-                    "mixHash" : "9d1c01f1068c169d0e6462209a8e628ba8504aa79e0b5138360784c5aff132ca",
-                    "nonce" : "f5f667a7ee89821f",
+                    "hash" : "0xfe5ca741b3c77c732a17d19e10c281067549a119b43c37a41e3eebb60f637d33",
+                    "mixHash" : "0x7e0bf498238044a6754c1f012ae7ed9362ca83122741aa66002fedf421d2d5c7",
+                    "nonce" : "0x1faab22254d56bba",
                     "number" : "0x01",
-                    "parentHash" : "cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
-                    "receiptTrie" : "35d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42e",
-                    "stateRoot" : "981824275acb3ac521a02ab95cc038c16544646f29d53aec4f855f684e5b2946",
+                    "parentHash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
+                    "receiptTrie" : "0x35d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42e",
+                    "stateRoot" : "0x981824275acb3ac521a02ab95cc038c16544646f29d53aec4f855f684e5b2946",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0981824275acb3ac521a02ab95cc038c16544646f29d53aec4f855f684e5b2946a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a035d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a09d1c01f1068c169d0e6462209a8e628ba8504aa79e0b5138360784c5aff132ca88f5f667a7ee89821ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0981824275acb3ac521a02ab95cc038c16544646f29d53aec4f855f684e5b2946a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a035d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a07e0bf498238044a6754c1f012ae7ed9362ca83122741aa66002fedf421d2d5c7881faab22254d56bbaf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -281,81 +296,81 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "946e964ca8a0f3406022038511088e46ef3983dbaa9164845639e4a539a1449d",
+        "lastblockhash" : "0xfe5ca741b3c77c732a17d19e10c281067549a119b43c37a41e3eebb60f637d33",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4df3d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a76320c3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -363,36 +378,41 @@
         }
     },
     "callcodecallcode_11_SuicideEnd_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xdf3d",
-                    "hash" : "9fdb40af6cff6dd5817b856171730e92d8afefd472a708fa6b27990d57a44ac1",
-                    "mixHash" : "aca9e4032de16a399d844b963b8965cc3e56b8d8f2b4d9a94a713efa6c353646",
-                    "nonce" : "3d4ed84acf301e97",
+                    "hash" : "0x2f6ea8046b0b6c05c73d72c27de730a76dbf77259a14ceddbd5637fc74de8b47",
+                    "mixHash" : "0xf2ffa974b8fced7831865c0a7369048d11ac704c3021b491ca84faad9ad9ac5f",
+                    "nonce" : "0xabaf4a88833df356",
                     "number" : "0x01",
-                    "parentHash" : "cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
-                    "receiptTrie" : "35d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42e",
-                    "stateRoot" : "981824275acb3ac521a02ab95cc038c16544646f29d53aec4f855f684e5b2946",
+                    "parentHash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
+                    "receiptTrie" : "0x35d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42e",
+                    "stateRoot" : "0x981824275acb3ac521a02ab95cc038c16544646f29d53aec4f855f684e5b2946",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0981824275acb3ac521a02ab95cc038c16544646f29d53aec4f855f684e5b2946a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a035d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0aca9e4032de16a399d844b963b8965cc3e56b8d8f2b4d9a94a713efa6c353646883d4ed84acf301e97f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0981824275acb3ac521a02ab95cc038c16544646f29d53aec4f855f684e5b2946a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a035d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0f2ffa974b8fced7831865c0a7369048d11ac704c3021b491ca84faad9ad9ac5f88abaf4a88833df356f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -402,81 +422,214 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9fdb40af6cff6dd5817b856171730e92d8afefd472a708fa6b27990d57a44ac1",
+        "lastblockhash" : "0x2f6ea8046b0b6c05c73d72c27de730a76dbf77259a14ceddbd5637fc74de8b47",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4df3d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a76320c3",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x65a7aa3dc70b6e36969c7742aa41512337d85a30d6d042027501a48dbee5ec7f",
+                    "mixHash" : "0xca39c81432a4e75c2d2476b9e14f81c0753864da6635ca0560faceecd6287855",
+                    "nonce" : "0x487d9dcae454e258",
+                    "number" : "0x01",
+                    "parentHash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
+                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
+                    "stateRoot" : "0x3f096f3a3247d94d7d880db367dfdb0b055c9820124ade8ee541cd8a9cc6b58e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f096f3a3247d94d7d880db367dfdb0b055c9820124ade8ee541cd8a9cc6b58ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0ca39c81432a4e75c2d2476b9e14f81c0753864da6635ca0560faceecd628785588487d9dcae454e258f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x65a7aa3dc70b6e36969c7742aa41512337d85a30d6d042027501a48dbee5ec7f",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_d0g0v0.json
index 7b7e31520..f46e20c66 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcode_11_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcode_11_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03997d",
-                    "hash" : "22dfc8b44a0839e4e91c0b3b9516f1ac2328ee9fb8160edc65962bff97d31df7",
-                    "mixHash" : "437996c08dac7a19543fde047178eac3a509f5d6387010026ed3441367797f5d",
-                    "nonce" : "0336466de44f81c9",
+                    "hash" : "0xbf077e9d04903d0d067c9f924de4cbdc2f771806c87db6dfa3f7b198bd66cd20",
+                    "mixHash" : "0x0df5f0aca55ffc0f14300a3f1247744d9f9e696595ecefbbbbe74efe49ea6b8f",
+                    "nonce" : "0xca7d14f5a6521e4e",
                     "number" : "0x01",
-                    "parentHash" : "6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
-                    "receiptTrie" : "3bcbbbde13385ffdbeb4b3e38a68533c7bc5a907ad13764286d0c3c8dc2090ad",
-                    "stateRoot" : "99c848bba3f970bd987b4bfd031061739cb6a21361b9fa300eebf5cab5394a1e",
+                    "parentHash" : "0x6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
+                    "receiptTrie" : "0x3bcbbbde13385ffdbeb4b3e38a68533c7bc5a907ad13764286d0c3c8dc2090ad",
+                    "stateRoot" : "0x99c848bba3f970bd987b4bfd031061739cb6a21361b9fa300eebf5cab5394a1e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa099c848bba3f970bd987b4bfd031061739cb6a21361b9fa300eebf5cab5394a1ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03bcbbbde13385ffdbeb4b3e38a68533c7bc5a907ad13764286d0c3c8dc2090adb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a0437996c08dac7a19543fde047178eac3a509f5d6387010026ed3441367797f5d880336466de44f81c9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa099c848bba3f970bd987b4bfd031061739cb6a21361b9fa300eebf5cab5394a1ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03bcbbbde13385ffdbeb4b3e38a68533c7bc5a907ad13764286d0c3c8dc2090adb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a00df5f0aca55ffc0f14300a3f1247744d9f9e696595ecefbbbbe74efe49ea6b8f88ca7d14f5a6521e4ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "631b8d9ff47455a807d70c84ecebd418bedb62af1f88a7b497827c6605610420",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x631b8d9ff47455a807d70c84ecebd418bedb62af1f88a7b497827c6605610420",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0631b8d9ff47455a807d70c84ecebd418bedb62af1f88a7b497827c6605610420a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "22dfc8b44a0839e4e91c0b3b9516f1ac2328ee9fb8160edc65962bff97d31df7",
+        "lastblockhash" : "0xbf077e9d04903d0d067c9f924de4cbdc2f771806c87db6dfa3f7b198bd66cd20",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -77,60 +82,60 @@
                     "0xf0" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7997d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7606683",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -138,36 +143,41 @@
         }
     },
     "callcodecallcode_11_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcode_11_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03997d",
-                    "hash" : "6d5c13dc8f542b9ca7c5781ee5cc3ad712edce895d239ba48ca37416786921bd",
-                    "mixHash" : "b51a1638060dd173434515cef7c020a1563af44a7d4d233ebd9b17c3fe23d234",
-                    "nonce" : "a88d21154169c95a",
+                    "hash" : "0xaf0607494bcee64a2eb443cb82e8c7c434fa273cf6096842b26944695a462119",
+                    "mixHash" : "0x65c8e1b773b7ef73de554df8fd85e376556f2f95c6ae6b299d0c32bfc5692553",
+                    "nonce" : "0xd161f979b8cedd96",
                     "number" : "0x01",
-                    "parentHash" : "6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
-                    "receiptTrie" : "3bcbbbde13385ffdbeb4b3e38a68533c7bc5a907ad13764286d0c3c8dc2090ad",
-                    "stateRoot" : "99c848bba3f970bd987b4bfd031061739cb6a21361b9fa300eebf5cab5394a1e",
+                    "parentHash" : "0x6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
+                    "receiptTrie" : "0x3bcbbbde13385ffdbeb4b3e38a68533c7bc5a907ad13764286d0c3c8dc2090ad",
+                    "stateRoot" : "0x99c848bba3f970bd987b4bfd031061739cb6a21361b9fa300eebf5cab5394a1e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa099c848bba3f970bd987b4bfd031061739cb6a21361b9fa300eebf5cab5394a1ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03bcbbbde13385ffdbeb4b3e38a68533c7bc5a907ad13764286d0c3c8dc2090adb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a0b51a1638060dd173434515cef7c020a1563af44a7d4d233ebd9b17c3fe23d23488a88d21154169c95af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa099c848bba3f970bd987b4bfd031061739cb6a21361b9fa300eebf5cab5394a1ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03bcbbbde13385ffdbeb4b3e38a68533c7bc5a907ad13764286d0c3c8dc2090adb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a065c8e1b773b7ef73de554df8fd85e376556f2f95c6ae6b299d0c32bfc569255388d161f979b8cedd96f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -177,28 +187,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "631b8d9ff47455a807d70c84ecebd418bedb62af1f88a7b497827c6605610420",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x631b8d9ff47455a807d70c84ecebd418bedb62af1f88a7b497827c6605610420",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0631b8d9ff47455a807d70c84ecebd418bedb62af1f88a7b497827c6605610420a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "6d5c13dc8f542b9ca7c5781ee5cc3ad712edce895d239ba48ca37416786921bd",
+        "lastblockhash" : "0xaf0607494bcee64a2eb443cb82e8c7c434fa273cf6096842b26944695a462119",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -215,60 +225,60 @@
                     "0xf0" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7997d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7606683",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -276,36 +286,41 @@
         }
     },
     "callcodecallcode_11_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcode_11_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x039455",
-                    "hash" : "e268dfdd7cc65150a5712dbe33acf5963e219987b187a5d1a6c66e1ba305ac30",
-                    "mixHash" : "3be1bb2fcd39301830c770729965c7532e2db80d7dc3d74d6326bf0f886d598f",
-                    "nonce" : "180b60810b2e1da8",
+                    "hash" : "0x2308682114729f63d2cbc2e5ff0aa86cf3bc3f1cd16ebe4c7c8ce9371e48c0ec",
+                    "mixHash" : "0x830dfde14d1a75fb64fd62ed6c6a66068d771e4c081e74e5a47089ec194b5f2b",
+                    "nonce" : "0x073f65d5678732d1",
                     "number" : "0x01",
-                    "parentHash" : "6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
-                    "receiptTrie" : "0f22a1a25254fbd1a13cfe38033a8541b95e8ed5138db69a592d5bc9eb604b17",
-                    "stateRoot" : "bae9ee8e12b0a5c78538ffdd95f31cc4ad4df8eb7d7aedbc9642a1a505d6169b",
+                    "parentHash" : "0x6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
+                    "receiptTrie" : "0x0f22a1a25254fbd1a13cfe38033a8541b95e8ed5138db69a592d5bc9eb604b17",
+                    "stateRoot" : "0xbae9ee8e12b0a5c78538ffdd95f31cc4ad4df8eb7d7aedbc9642a1a505d6169b",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bae9ee8e12b0a5c78538ffdd95f31cc4ad4df8eb7d7aedbc9642a1a505d6169ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a00f22a1a25254fbd1a13cfe38033a8541b95e8ed5138db69a592d5bc9eb604b17b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a03be1bb2fcd39301830c770729965c7532e2db80d7dc3d74d6326bf0f886d598f88180b60810b2e1da8f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bae9ee8e12b0a5c78538ffdd95f31cc4ad4df8eb7d7aedbc9642a1a505d6169ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a00f22a1a25254fbd1a13cfe38033a8541b95e8ed5138db69a592d5bc9eb604b17b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a0830dfde14d1a75fb64fd62ed6c6a66068d771e4c081e74e5a47089ec194b5f2b88073f65d5678732d1f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -315,28 +330,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "631b8d9ff47455a807d70c84ecebd418bedb62af1f88a7b497827c6605610420",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x631b8d9ff47455a807d70c84ecebd418bedb62af1f88a7b497827c6605610420",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0631b8d9ff47455a807d70c84ecebd418bedb62af1f88a7b497827c6605610420a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e268dfdd7cc65150a5712dbe33acf5963e219987b187a5d1a6c66e1ba305ac30",
+        "lastblockhash" : "0x2308682114729f63d2cbc2e5ff0aa86cf3bc3f1cd16ebe4c7c8ce9371e48c0ec",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -353,60 +368,60 @@
                     "0xf0" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f79455",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7606bab",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -414,36 +429,41 @@
         }
     },
     "callcodecallcode_11_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcode_11_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x039455",
-                    "hash" : "8b31689477be7eaf777f80ddd8ab9fc98ecb1cba014abec124cd8b19e3cf567b",
-                    "mixHash" : "062889f0c6c3d3201704fc47047c8984e4018f1f6fe2186a44365d4060322bdf",
-                    "nonce" : "fac11afb13dfebeb",
+                    "hash" : "0xacc765dcfc67baac6f67ae2573921b9caf42eb903a035ff99b7b3205352bb649",
+                    "mixHash" : "0x8b0015e7b90b478b76932de7736a9c169b33e60161dc7129d079348e971e13c1",
+                    "nonce" : "0x2e6ad2ac9b3e83ac",
                     "number" : "0x01",
-                    "parentHash" : "6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
-                    "receiptTrie" : "0f22a1a25254fbd1a13cfe38033a8541b95e8ed5138db69a592d5bc9eb604b17",
-                    "stateRoot" : "bae9ee8e12b0a5c78538ffdd95f31cc4ad4df8eb7d7aedbc9642a1a505d6169b",
+                    "parentHash" : "0x6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
+                    "receiptTrie" : "0x0f22a1a25254fbd1a13cfe38033a8541b95e8ed5138db69a592d5bc9eb604b17",
+                    "stateRoot" : "0xbae9ee8e12b0a5c78538ffdd95f31cc4ad4df8eb7d7aedbc9642a1a505d6169b",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bae9ee8e12b0a5c78538ffdd95f31cc4ad4df8eb7d7aedbc9642a1a505d6169ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a00f22a1a25254fbd1a13cfe38033a8541b95e8ed5138db69a592d5bc9eb604b17b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a0062889f0c6c3d3201704fc47047c8984e4018f1f6fe2186a44365d4060322bdf88fac11afb13dfebebf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bae9ee8e12b0a5c78538ffdd95f31cc4ad4df8eb7d7aedbc9642a1a505d6169ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a00f22a1a25254fbd1a13cfe38033a8541b95e8ed5138db69a592d5bc9eb604b17b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a08b0015e7b90b478b76932de7736a9c169b33e60161dc7129d079348e971e13c1882e6ad2ac9b3e83acf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -453,28 +473,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "631b8d9ff47455a807d70c84ecebd418bedb62af1f88a7b497827c6605610420",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x631b8d9ff47455a807d70c84ecebd418bedb62af1f88a7b497827c6605610420",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0631b8d9ff47455a807d70c84ecebd418bedb62af1f88a7b497827c6605610420a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8b31689477be7eaf777f80ddd8ab9fc98ecb1cba014abec124cd8b19e3cf567b",
+        "lastblockhash" : "0xacc765dcfc67baac6f67ae2573921b9caf42eb903a035ff99b7b3205352bb649",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -491,60 +511,210 @@
                     "0xf0" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f79455",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7606bab",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcode_11_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x03997d",
+                    "hash" : "0xef4c886da9bdb89e4dedeadf766151dcb14d0c9ce0b1c1bf69295961f3913353",
+                    "mixHash" : "0xe808a3dce69edb6ba1c63ec9fdec11c0a12b09de669d4f94cba75bcad2284ff6",
+                    "nonce" : "0xb9f9f1e088ca8aab",
+                    "number" : "0x01",
+                    "parentHash" : "0x6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
+                    "receiptTrie" : "0x607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03beb",
+                    "stateRoot" : "0x830dcbd90668ce17bfda99a10e697d538b349915b6bdaac7d0fbdbf0a4ad9b00",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a06d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830dcbd90668ce17bfda99a10e697d538b349915b6bdaac7d0fbdbf0a4ad9b00a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03bebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a0e808a3dce69edb6ba1c63ec9fdec11c0a12b09de669d4f94cba75bcad2284ff688b9f9f1e088ca8aabf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xef4c886da9bdb89e4dedeadf766151dcb14d0c9ce0b1c1bf69295961f3913353",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE_d0g0v0.json
index 1b2418fce..cbe68b1e7 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcodecall_110_OOGE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "f5eb3e5686bc86aaf7bdad2e84a733c53901588b5ff135a5307fe6cbb1ee48c5",
-                    "mixHash" : "39d3f5980d9565e794f579a17fa6e2d67bbbfcee0ce62bc394750068432412ef",
-                    "nonce" : "cdcb941aa555fc81",
+                    "hash" : "0xc23de353e0920df44bf5067719b2f9e3218b0d0d7b293b84ffe40336b51cbf36",
+                    "mixHash" : "0x55ee0c299400e239fb2400848b5af0742719bc16ebe76121f78078c6683c8a67",
+                    "nonce" : "0xb243627a7f289a43",
                     "number" : "0x01",
-                    "parentHash" : "4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
-                    "receiptTrie" : "180660d7653f49f1f50b53093faa6a0884872c4bb331da5b7885ac38ba75e935",
-                    "stateRoot" : "10ad30f912d0e95159d347f1bbb0a956388a11fbda8888e57a4911abf630d6c5",
+                    "parentHash" : "0x4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
+                    "receiptTrie" : "0x180660d7653f49f1f50b53093faa6a0884872c4bb331da5b7885ac38ba75e935",
+                    "stateRoot" : "0x10ad30f912d0e95159d347f1bbb0a956388a11fbda8888e57a4911abf630d6c5",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a04ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010ad30f912d0e95159d347f1bbb0a956388a11fbda8888e57a4911abf630d6c5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0180660d7653f49f1f50b53093faa6a0884872c4bb331da5b7885ac38ba75e935b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a039d3f5980d9565e794f579a17fa6e2d67bbbfcee0ce62bc394750068432412ef88cdcb941aa555fc81f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a04ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010ad30f912d0e95159d347f1bbb0a956388a11fbda8888e57a4911abf630d6c5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0180660d7653f49f1f50b53093faa6a0884872c4bb331da5b7885ac38ba75e935b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a055ee0c299400e239fb2400848b5af0742719bc16ebe76121f78078c6683c8a6788b243627a7f289a43f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "2e9c685def9ab91b1769f936072a25e1ec626b60fe4b52bed82cc38fb7403aa6",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2e9c685def9ab91b1769f936072a25e1ec626b60fe4b52bed82cc38fb7403aa6",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e9c685def9ab91b1769f936072a25e1ec626b60fe4b52bed82cc38fb7403aa6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f5eb3e5686bc86aaf7bdad2e84a733c53901588b5ff135a5307fe6cbb1ee48c5",
+        "lastblockhash" : "0xc23de353e0920df44bf5067719b2f9e3218b0d0d7b293b84ffe40336b51cbf36",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -69,74 +74,74 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55892",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762a76e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -144,36 +149,41 @@
         }
     },
     "callcodecallcodecall_110_OOGE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "70e0e37f5d84013de9750e79232a06ac2778af3f4bbcb11fe6c0ac045c7539b6",
-                    "mixHash" : "abe8fa050b38d4adb639166da9c91b1d4a0cd039d71c9438c2e1fd8e59d028bc",
-                    "nonce" : "f23c2fa1bc6b753d",
+                    "hash" : "0x7675ee175e32447c08f5c96aa1b73728e102050eafbfea320016cae112eeee68",
+                    "mixHash" : "0x9b42a1d148eb2762429a002cb5f00813c09b3e00e93383e737e5949da8dfaed5",
+                    "nonce" : "0x29c128aae40d1a58",
                     "number" : "0x01",
-                    "parentHash" : "4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
-                    "receiptTrie" : "180660d7653f49f1f50b53093faa6a0884872c4bb331da5b7885ac38ba75e935",
-                    "stateRoot" : "10ad30f912d0e95159d347f1bbb0a956388a11fbda8888e57a4911abf630d6c5",
+                    "parentHash" : "0x4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
+                    "receiptTrie" : "0x180660d7653f49f1f50b53093faa6a0884872c4bb331da5b7885ac38ba75e935",
+                    "stateRoot" : "0x10ad30f912d0e95159d347f1bbb0a956388a11fbda8888e57a4911abf630d6c5",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a04ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010ad30f912d0e95159d347f1bbb0a956388a11fbda8888e57a4911abf630d6c5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0180660d7653f49f1f50b53093faa6a0884872c4bb331da5b7885ac38ba75e935b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0abe8fa050b38d4adb639166da9c91b1d4a0cd039d71c9438c2e1fd8e59d028bc88f23c2fa1bc6b753df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a04ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010ad30f912d0e95159d347f1bbb0a956388a11fbda8888e57a4911abf630d6c5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0180660d7653f49f1f50b53093faa6a0884872c4bb331da5b7885ac38ba75e935b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a09b42a1d148eb2762429a002cb5f00813c09b3e00e93383e737e5949da8dfaed58829c128aae40d1a58f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -183,28 +193,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "2e9c685def9ab91b1769f936072a25e1ec626b60fe4b52bed82cc38fb7403aa6",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2e9c685def9ab91b1769f936072a25e1ec626b60fe4b52bed82cc38fb7403aa6",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e9c685def9ab91b1769f936072a25e1ec626b60fe4b52bed82cc38fb7403aa6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "70e0e37f5d84013de9750e79232a06ac2778af3f4bbcb11fe6c0ac045c7539b6",
+        "lastblockhash" : "0x7675ee175e32447c08f5c96aa1b73728e102050eafbfea320016cae112eeee68",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -213,74 +223,74 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55892",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762a76e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -288,36 +298,41 @@
         }
     },
     "callcodecallcodecall_110_OOGE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "d16140ded32b4560a79b28ee7b6c1bead10178cdc5a4af9b950c49426474af53",
-                    "mixHash" : "274c801f74bf9ca43734101b5e88b597795d84f4a7481c1196884c8607a9e6ab",
-                    "nonce" : "f24ccb015a28168d",
+                    "hash" : "0xf836b1b51f346ca2a3f598bdc5a58df61b0507fcec3ca022a5269a5b626f074d",
+                    "mixHash" : "0x6ca4dad2d5b35dd701acccb576586d46092da050bfb32d6dce3a65d5c3b843c0",
+                    "nonce" : "0xcd26e689e76a2c62",
                     "number" : "0x01",
-                    "parentHash" : "4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
-                    "receiptTrie" : "f80167bd10d523fe2d7ea36201d4f5858e441d88475685939b51d16ab3483b03",
-                    "stateRoot" : "01ee033afac0b8d9c31dab8cc2c8270f70845becc125f31ae3e752ae07720cb3",
+                    "parentHash" : "0x4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
+                    "receiptTrie" : "0xf80167bd10d523fe2d7ea36201d4f5858e441d88475685939b51d16ab3483b03",
+                    "stateRoot" : "0x01ee033afac0b8d9c31dab8cc2c8270f70845becc125f31ae3e752ae07720cb3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a04ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001ee033afac0b8d9c31dab8cc2c8270f70845becc125f31ae3e752ae07720cb3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f80167bd10d523fe2d7ea36201d4f5858e441d88475685939b51d16ab3483b03b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0274c801f74bf9ca43734101b5e88b597795d84f4a7481c1196884c8607a9e6ab88f24ccb015a28168df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a04ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001ee033afac0b8d9c31dab8cc2c8270f70845becc125f31ae3e752ae07720cb3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f80167bd10d523fe2d7ea36201d4f5858e441d88475685939b51d16ab3483b03b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a06ca4dad2d5b35dd701acccb576586d46092da050bfb32d6dce3a65d5c3b843c088cd26e689e76a2c62f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -327,28 +342,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "2e9c685def9ab91b1769f936072a25e1ec626b60fe4b52bed82cc38fb7403aa6",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2e9c685def9ab91b1769f936072a25e1ec626b60fe4b52bed82cc38fb7403aa6",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e9c685def9ab91b1769f936072a25e1ec626b60fe4b52bed82cc38fb7403aa6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d16140ded32b4560a79b28ee7b6c1bead10178cdc5a4af9b950c49426474af53",
+        "lastblockhash" : "0xf836b1b51f346ca2a3f598bdc5a58df61b0507fcec3ca022a5269a5b626f074d",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -357,74 +372,74 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550d6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af2a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -432,36 +447,41 @@
         }
     },
     "callcodecallcodecall_110_OOGE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "428598acf1375bdb147a46bdbe6949f3b34f4753ef7580439fda833ac7a54359",
-                    "mixHash" : "296611b2bdc14f439c165eb6e4ff9f1a632c10206d6b95e92e73388530eaaaff",
-                    "nonce" : "8c397bc78a3876d1",
+                    "hash" : "0xe6d7921d0b8a5d0a1ac4dae42b45e9b43f3f6167b7df43030e391eb21ff265ef",
+                    "mixHash" : "0x38f1696a8b1bede4d7124c206bd5b6dab677a4b9be8c745851b42448ef1e65e5",
+                    "nonce" : "0xa43409a3352302fd",
                     "number" : "0x01",
-                    "parentHash" : "4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
-                    "receiptTrie" : "f80167bd10d523fe2d7ea36201d4f5858e441d88475685939b51d16ab3483b03",
-                    "stateRoot" : "01ee033afac0b8d9c31dab8cc2c8270f70845becc125f31ae3e752ae07720cb3",
+                    "parentHash" : "0x4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
+                    "receiptTrie" : "0xf80167bd10d523fe2d7ea36201d4f5858e441d88475685939b51d16ab3483b03",
+                    "stateRoot" : "0x01ee033afac0b8d9c31dab8cc2c8270f70845becc125f31ae3e752ae07720cb3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a04ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001ee033afac0b8d9c31dab8cc2c8270f70845becc125f31ae3e752ae07720cb3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f80167bd10d523fe2d7ea36201d4f5858e441d88475685939b51d16ab3483b03b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0296611b2bdc14f439c165eb6e4ff9f1a632c10206d6b95e92e73388530eaaaff888c397bc78a3876d1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a04ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001ee033afac0b8d9c31dab8cc2c8270f70845becc125f31ae3e752ae07720cb3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f80167bd10d523fe2d7ea36201d4f5858e441d88475685939b51d16ab3483b03b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a038f1696a8b1bede4d7124c206bd5b6dab677a4b9be8c745851b42448ef1e65e588a43409a3352302fdf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -471,28 +491,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "2e9c685def9ab91b1769f936072a25e1ec626b60fe4b52bed82cc38fb7403aa6",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2e9c685def9ab91b1769f936072a25e1ec626b60fe4b52bed82cc38fb7403aa6",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e9c685def9ab91b1769f936072a25e1ec626b60fe4b52bed82cc38fb7403aa6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "428598acf1375bdb147a46bdbe6949f3b34f4753ef7580439fda833ac7a54359",
+        "lastblockhash" : "0xe6d7921d0b8a5d0a1ac4dae42b45e9b43f3f6167b7df43030e391eb21ff265ef",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -501,74 +521,230 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550d6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af2a",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xc6041539a4388e823b744d33b7456058c6382fd771b15fb4337cd3e91032f9d5",
+                    "mixHash" : "0xe56031a123015d340a7ccc494f86e68aa1a5f3fac00e17f3c70916482067a164",
+                    "nonce" : "0x4ec0075ea7e635b7",
+                    "number" : "0x01",
+                    "parentHash" : "0x4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0x2ff35b6aeb7ec3224c68f11efc4da3095bd294e36d74b44200b5629dd9ee499e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a04ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ff35b6aeb7ec3224c68f11efc4da3095bd294e36d74b44200b5629dd9ee499ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0e56031a123015d340a7ccc494f86e68aa1a5f3fac00e17f3c70916482067a164884ec0075ea7e635b7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0xc6041539a4388e823b744d33b7456058c6382fd771b15fb4337cd3e91032f9d5",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter_d0g0v0.json
index 6cd070415..ae516bb4f 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcodecall_110_OOGMAfter_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "cc92641ad86bb02c2f22368b364f396b875dfb107752da97ffc6f9fd794a2a97",
-                    "mixHash" : "092b048e148aee1d6ce56663e7976e4e830a054ccd8fc7595303bb20d91025e2",
-                    "nonce" : "de2704e5bcc22d5b",
+                    "hash" : "0x9a53892547d22b53019f685f36cd28170e0443ec372d28bd590419f72560c2be",
+                    "mixHash" : "0x6601078005c37261b7838541306193804118923bb5cd6f3e7e0bcf29eadcddd2",
+                    "nonce" : "0x6b7bdfef7958a7a1",
                     "number" : "0x01",
-                    "parentHash" : "90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
-                    "receiptTrie" : "6d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6d",
-                    "stateRoot" : "e571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7",
+                    "parentHash" : "0x90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
+                    "receiptTrie" : "0x6d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6d",
+                    "stateRoot" : "0xe571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a090a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0092b048e148aee1d6ce56663e7976e4e830a054ccd8fc7595303bb20d91025e288de2704e5bcc22d5bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a090a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a06601078005c37261b7838541306193804118923bb5cd6f3e7e0bcf29eadcddd2886b7bdfef7958a7a1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "28dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x28dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "cc92641ad86bb02c2f22368b364f396b875dfb107752da97ffc6f9fd794a2a97",
+        "lastblockhash" : "0x9a53892547d22b53019f685f36cd28170e0443ec372d28bd590419f72560c2be",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcodecallcodecall_110_OOGMAfter_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "3cff68d34a47b6ecab498b78e19f9dd60eabb4670ef9a0fca43a8198f26f0a6a",
-                    "mixHash" : "8b5905abe549141695d23edeaa855ce2296a7f2d9e319fbfd6013dfb8814b109",
-                    "nonce" : "7dba9e1826467102",
+                    "hash" : "0xe0fae8f0fd7701fc75480cae0affcb792f4b626aa56006efd39c8764a61a338d",
+                    "mixHash" : "0xfaf43470d029c0bfb92869ceaa8288c91d13d3a1ec2a89bf28716ff39a1f8d1a",
+                    "nonce" : "0x57823fe3813541f4",
                     "number" : "0x01",
-                    "parentHash" : "90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
-                    "receiptTrie" : "6d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6d",
-                    "stateRoot" : "e571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7",
+                    "parentHash" : "0x90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
+                    "receiptTrie" : "0x6d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6d",
+                    "stateRoot" : "0xe571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a090a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a08b5905abe549141695d23edeaa855ce2296a7f2d9e319fbfd6013dfb8814b109887dba9e1826467102f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a090a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0faf43470d029c0bfb92869ceaa8288c91d13d3a1ec2a89bf28716ff39a1f8d1a8857823fe3813541f4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "28dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x28dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3cff68d34a47b6ecab498b78e19f9dd60eabb4670ef9a0fca43a8198f26f0a6a",
+        "lastblockhash" : "0xe0fae8f0fd7701fc75480cae0affcb792f4b626aa56006efd39c8764a61a338d",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcodecallcodecall_110_OOGMAfter_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "7a19a9d271ea158d4923fa2bbf8a3f26eeb68b12260f0e911529c5a3ac345ef1",
-                    "mixHash" : "340d99a1fe6fdfce135abb7ad305cf634dbdef3fcafd72b32d2eb7eeca56d6d0",
-                    "nonce" : "ab16f290a2dbbffe",
+                    "hash" : "0x19f6d010ba497dc4de6f4b94d9da8d7883694a682a8b04b748dcaa69fcbc5ac2",
+                    "mixHash" : "0x8c53ec4ecdf92ca2f9e4560d7f0ab2a43717a3c0fbc0034ee3d37e34b0bc69fc",
+                    "nonce" : "0xa226f26e78827f3d",
                     "number" : "0x01",
-                    "parentHash" : "90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
-                    "receiptTrie" : "5bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cf",
-                    "stateRoot" : "4f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31a",
+                    "parentHash" : "0x90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
+                    "receiptTrie" : "0x5bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cf",
+                    "stateRoot" : "0x4f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a090a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0340d99a1fe6fdfce135abb7ad305cf634dbdef3fcafd72b32d2eb7eeca56d6d088ab16f290a2dbbffef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a090a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a08c53ec4ecdf92ca2f9e4560d7f0ab2a43717a3c0fbc0034ee3d37e34b0bc69fc88a226f26e78827f3df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "28dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x28dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7a19a9d271ea158d4923fa2bbf8a3f26eeb68b12260f0e911529c5a3ac345ef1",
+        "lastblockhash" : "0x19f6d010ba497dc4de6f4b94d9da8d7883694a682a8b04b748dcaa69fcbc5ac2",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcodecallcodecall_110_OOGMAfter_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "dbd925441ae51261b2353718dbe832d1983e3b13faa20e73ae698e65dfc58c6c",
-                    "mixHash" : "4738d435f33b1a3a184ebeccd97af5080c003d7d36246c269760433a02a7e515",
-                    "nonce" : "7862347cd0b2a176",
+                    "hash" : "0x3fbdda5fe463bd1330c329c6aee871b8ef6891b365930c427f80610cf2eb9c06",
+                    "mixHash" : "0x9e105bbca05fcc09217e1beabe67541bb7c74fca7fc4a029bec3bbf73adf1be4",
+                    "nonce" : "0xbc71c52fcb57ebbd",
                     "number" : "0x01",
-                    "parentHash" : "90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
-                    "receiptTrie" : "5bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cf",
-                    "stateRoot" : "4f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31a",
+                    "parentHash" : "0x90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
+                    "receiptTrie" : "0x5bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cf",
+                    "stateRoot" : "0x4f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a090a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a04738d435f33b1a3a184ebeccd97af5080c003d7d36246c269760433a02a7e515887862347cd0b2a176f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a090a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a09e105bbca05fcc09217e1beabe67541bb7c74fca7fc4a029bec3bbf73adf1be488bc71c52fcb57ebbdf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "28dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x28dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "dbd925441ae51261b2353718dbe832d1983e3b13faa20e73ae698e65dfc58c6c",
+        "lastblockhash" : "0x3fbdda5fe463bd1330c329c6aee871b8ef6891b365930c427f80610cf2eb9c06",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x46d54e1b0554211e6b82674e55edb1eba569fd734d50d99261a462f31f26cd11",
+                    "mixHash" : "0xbb466fbf770348acbb7e7b627dfc79ad3694e022f15dc606daf5a4fc66e91542",
+                    "nonce" : "0xa504901abc8c67ef",
+                    "number" : "0x01",
+                    "parentHash" : "0x90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0x399fbc37612547a52edb3d609a876791b4bf4ee5f411fc45c7e8678e50a2effb",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a090a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0399fbc37612547a52edb3d609a876791b4bf4ee5f411fc45c7e8678e50a2effba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0bb466fbf770348acbb7e7b627dfc79ad3694e022f15dc606daf5a4fc66e9154288a504901abc8c67eff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0x46d54e1b0554211e6b82674e55edb1eba569fd734d50d99261a462f31f26cd11",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore_d0g0v0.json
index 9d6cc7b57..f91c75e1a 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcodecall_110_OOGMBefore_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "b5acd62091be8f1488929c3bf4448494c4cc79f98bddadcbcf4e8366c20d40c1",
-                    "mixHash" : "7b04269a24cb5ec0064b463554543ec8ed2c4a02dd4633fb654fae09935bc67b",
-                    "nonce" : "1e1f59f057d03d07",
+                    "hash" : "0xdf9e533bb6722fd893a56037e4188ef35a1e06d0d01b14d3a239fd21ceedb2de",
+                    "mixHash" : "0xbbec3d477698014719f61240192ca8e6cfadd8c430b645c490bb8520317a8ae0",
+                    "nonce" : "0x47b2b778aeefdf4b",
                     "number" : "0x01",
-                    "parentHash" : "61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
-                    "receiptTrie" : "fdc5781ddfd606983de8508dd00d2dc40389eaaeedca182bd6fd930065ca94a1",
-                    "stateRoot" : "06402aae3729f709aa965ff8ee6418db56c27f88dff8dfc8209bb8e3d52dc5bb",
+                    "parentHash" : "0x61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
+                    "receiptTrie" : "0xfdc5781ddfd606983de8508dd00d2dc40389eaaeedca182bd6fd930065ca94a1",
+                    "stateRoot" : "0x06402aae3729f709aa965ff8ee6418db56c27f88dff8dfc8209bb8e3d52dc5bb",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a061e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006402aae3729f709aa965ff8ee6418db56c27f88dff8dfc8209bb8e3d52dc5bba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fdc5781ddfd606983de8508dd00d2dc40389eaaeedca182bd6fd930065ca94a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a07b04269a24cb5ec0064b463554543ec8ed2c4a02dd4633fb654fae09935bc67b881e1f59f057d03d07f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a061e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006402aae3729f709aa965ff8ee6418db56c27f88dff8dfc8209bb8e3d52dc5bba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fdc5781ddfd606983de8508dd00d2dc40389eaaeedca182bd6fd930065ca94a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0bbec3d477698014719f61240192ca8e6cfadd8c430b645c490bb8520317a8ae08847b2b778aeefdf4bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "5162cd5d9ce8f88f7ce1141b5a9f2185df82989a73f1b9dc7403b476485e79ac",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5162cd5d9ce8f88f7ce1141b5a9f2185df82989a73f1b9dc7403b476485e79ac",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05162cd5d9ce8f88f7ce1141b5a9f2185df82989a73f1b9dc7403b476485e79aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b5acd62091be8f1488929c3bf4448494c4cc79f98bddadcbcf4e8366c20d40c1",
+        "lastblockhash" : "0xdf9e533bb6722fd893a56037e4188ef35a1e06d0d01b14d3a239fd21ceedb2de",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa0c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcodecallcodecall_110_OOGMBefore_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "b492d19b6565483b80f0d22de4dc5de5a53f7edd461bafdd10eb80d229d5289e",
-                    "mixHash" : "5257a951f218c72f7d50286455e638521598d45b5592244f1974192ee912b2de",
-                    "nonce" : "64987405b95e18d9",
+                    "hash" : "0xe1517e2ae36ca2fbd746aaa9c179cc012021a6ab82fc8f749e5d0b3e2c9dd178",
+                    "mixHash" : "0x856856a3c00cbec630be34d04b2ea4ddb759699be6f1b1c44d35d6968c8a8c9f",
+                    "nonce" : "0xc58cedb5c0089884",
                     "number" : "0x01",
-                    "parentHash" : "61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
-                    "receiptTrie" : "fdc5781ddfd606983de8508dd00d2dc40389eaaeedca182bd6fd930065ca94a1",
-                    "stateRoot" : "06402aae3729f709aa965ff8ee6418db56c27f88dff8dfc8209bb8e3d52dc5bb",
+                    "parentHash" : "0x61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
+                    "receiptTrie" : "0xfdc5781ddfd606983de8508dd00d2dc40389eaaeedca182bd6fd930065ca94a1",
+                    "stateRoot" : "0x06402aae3729f709aa965ff8ee6418db56c27f88dff8dfc8209bb8e3d52dc5bb",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a061e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006402aae3729f709aa965ff8ee6418db56c27f88dff8dfc8209bb8e3d52dc5bba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fdc5781ddfd606983de8508dd00d2dc40389eaaeedca182bd6fd930065ca94a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a05257a951f218c72f7d50286455e638521598d45b5592244f1974192ee912b2de8864987405b95e18d9f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a061e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006402aae3729f709aa965ff8ee6418db56c27f88dff8dfc8209bb8e3d52dc5bba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fdc5781ddfd606983de8508dd00d2dc40389eaaeedca182bd6fd930065ca94a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0856856a3c00cbec630be34d04b2ea4ddb759699be6f1b1c44d35d6968c8a8c9f88c58cedb5c0089884f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "5162cd5d9ce8f88f7ce1141b5a9f2185df82989a73f1b9dc7403b476485e79ac",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5162cd5d9ce8f88f7ce1141b5a9f2185df82989a73f1b9dc7403b476485e79ac",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05162cd5d9ce8f88f7ce1141b5a9f2185df82989a73f1b9dc7403b476485e79aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b492d19b6565483b80f0d22de4dc5de5a53f7edd461bafdd10eb80d229d5289e",
+        "lastblockhash" : "0xe1517e2ae36ca2fbd746aaa9c179cc012021a6ab82fc8f749e5d0b3e2c9dd178",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa0c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcodecallcodecall_110_OOGMBefore_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "a336c94e174e6f7b47effa36a0e69799e32a33c4a3703c1f18f0abf212f41052",
-                    "mixHash" : "ec59cb7fc42827cbc45d0f06d2103e9e983dd4a9a22815708d6a1ace1f155be3",
-                    "nonce" : "7312e2522c348601",
+                    "hash" : "0x531a3166a793c91351e0e5516b6225bedf99618ed252e10fb36ebd5cf6f4fc2c",
+                    "mixHash" : "0x09b264b134f9587d2f268b8af6ecedc129954c0c8544e360a21c06056bd26750",
+                    "nonce" : "0xc60dc699caaa094f",
                     "number" : "0x01",
-                    "parentHash" : "61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
-                    "receiptTrie" : "ce7c04a999bb55c66f8164d001e37541e30340058067bfcb2740c81cb3a9b139",
-                    "stateRoot" : "b49add2eb95fae1a344a76235c17d6e02a644e758bb0c6edb18a54c4edb9d2e2",
+                    "parentHash" : "0x61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
+                    "receiptTrie" : "0xce7c04a999bb55c66f8164d001e37541e30340058067bfcb2740c81cb3a9b139",
+                    "stateRoot" : "0xb49add2eb95fae1a344a76235c17d6e02a644e758bb0c6edb18a54c4edb9d2e2",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a061e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b49add2eb95fae1a344a76235c17d6e02a644e758bb0c6edb18a54c4edb9d2e2a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ce7c04a999bb55c66f8164d001e37541e30340058067bfcb2740c81cb3a9b139b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0ec59cb7fc42827cbc45d0f06d2103e9e983dd4a9a22815708d6a1ace1f155be3887312e2522c348601f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a061e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b49add2eb95fae1a344a76235c17d6e02a644e758bb0c6edb18a54c4edb9d2e2a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ce7c04a999bb55c66f8164d001e37541e30340058067bfcb2740c81cb3a9b139b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a009b264b134f9587d2f268b8af6ecedc129954c0c8544e360a21c06056bd2675088c60dc699caaa094ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,28 +340,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "5162cd5d9ce8f88f7ce1141b5a9f2185df82989a73f1b9dc7403b476485e79ac",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5162cd5d9ce8f88f7ce1141b5a9f2185df82989a73f1b9dc7403b476485e79ac",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05162cd5d9ce8f88f7ce1141b5a9f2185df82989a73f1b9dc7403b476485e79aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a336c94e174e6f7b47effa36a0e69799e32a33c4a3703c1f18f0abf212f41052",
+        "lastblockhash" : "0x531a3166a793c91351e0e5516b6225bedf99618ed252e10fb36ebd5cf6f4fc2c",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -354,74 +369,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -429,36 +444,41 @@
         }
     },
     "callcodecallcodecall_110_OOGMBefore_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "e0a416b5db73b34c124d9038973bf876e6d271fdb994ea10ff198dd7c49ce2b8",
-                    "mixHash" : "d0c25be161cc66efc236f1eb63811cd57517a397582a2ccc884fced5dcd9b0d1",
-                    "nonce" : "bbf77ee2481626d0",
+                    "hash" : "0x74cde843275589515ec916a0a2904f8e1015fc383fd4ba32150b07a714e3a84d",
+                    "mixHash" : "0xc43419b72e1f41510c8cd84b20a134259842bdbba2887e271b3396774b568f5d",
+                    "nonce" : "0xdb817d4ae77a9b9a",
                     "number" : "0x01",
-                    "parentHash" : "61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
-                    "receiptTrie" : "ce7c04a999bb55c66f8164d001e37541e30340058067bfcb2740c81cb3a9b139",
-                    "stateRoot" : "b49add2eb95fae1a344a76235c17d6e02a644e758bb0c6edb18a54c4edb9d2e2",
+                    "parentHash" : "0x61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
+                    "receiptTrie" : "0xce7c04a999bb55c66f8164d001e37541e30340058067bfcb2740c81cb3a9b139",
+                    "stateRoot" : "0xb49add2eb95fae1a344a76235c17d6e02a644e758bb0c6edb18a54c4edb9d2e2",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a061e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b49add2eb95fae1a344a76235c17d6e02a644e758bb0c6edb18a54c4edb9d2e2a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ce7c04a999bb55c66f8164d001e37541e30340058067bfcb2740c81cb3a9b139b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0d0c25be161cc66efc236f1eb63811cd57517a397582a2ccc884fced5dcd9b0d188bbf77ee2481626d0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a061e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b49add2eb95fae1a344a76235c17d6e02a644e758bb0c6edb18a54c4edb9d2e2a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ce7c04a999bb55c66f8164d001e37541e30340058067bfcb2740c81cb3a9b139b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0c43419b72e1f41510c8cd84b20a134259842bdbba2887e271b3396774b568f5d88db817d4ae77a9b9af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -468,28 +488,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "5162cd5d9ce8f88f7ce1141b5a9f2185df82989a73f1b9dc7403b476485e79ac",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5162cd5d9ce8f88f7ce1141b5a9f2185df82989a73f1b9dc7403b476485e79ac",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05162cd5d9ce8f88f7ce1141b5a9f2185df82989a73f1b9dc7403b476485e79aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e0a416b5db73b34c124d9038973bf876e6d271fdb994ea10ff198dd7c49ce2b8",
+        "lastblockhash" : "0x74cde843275589515ec916a0a2904f8e1015fc383fd4ba32150b07a714e3a84d",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -497,74 +517,229 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xfccb11655bfd985c8a279d98882b15369d2699cb1906e09b43fc7f040e1036d3",
+                    "mixHash" : "0xf939f36383c1ee52e8bd88135b1132bcdf2e736de8ea1b366e34b73a26f4574e",
+                    "nonce" : "0x3105f0dbbf291760",
+                    "number" : "0x01",
+                    "parentHash" : "0x61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0x3492b384d17f6555792baaf5ee7d937b9bd2034e27492007de588f6b60b1ca3e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a061e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03492b384d17f6555792baaf5ee7d937b9bd2034e27492007de588f6b60b1ca3ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0f939f36383c1ee52e8bd88135b1132bcdf2e736de8ea1b366e34b73a26f4574e883105f0dbbf291760f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0xfccb11655bfd985c8a279d98882b15369d2699cb1906e09b43fc7f040e1036d3",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd_d0g0v0.json
index 3dcc3b22b..e6ca8682b 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcodecall_110_SuicideEnd_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "e09253f21eba12e2ea4107c8c988505c2598026317295b698cb16ef7038ca012",
-                    "mixHash" : "828beb5af164061d88febb0080c740efbb3770c04a665d591bcde541bc713746",
-                    "nonce" : "93182d4a6e8e6be7",
+                    "hash" : "0x18f6f96b754d650393674d1d77123150d48be326f31e5b1aef61bccb37386993",
+                    "mixHash" : "0x1829b1b52b382646feac45e42d86cee79acc9f53ed44c1d4c046a7988008cdc1",
+                    "nonce" : "0xa1e1882570db3042",
                     "number" : "0x01",
-                    "parentHash" : "2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
-                    "receiptTrie" : "7d8d902db12b9f036c1e786d7617a5662b591cba0f7592f921e53df1ab092c67",
-                    "stateRoot" : "814641ffdd9899e2380df067baf35c87e5ddce3597b5804421801392f5a11cf5",
+                    "parentHash" : "0x2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
+                    "receiptTrie" : "0x7d8d902db12b9f036c1e786d7617a5662b591cba0f7592f921e53df1ab092c67",
+                    "stateRoot" : "0x814641ffdd9899e2380df067baf35c87e5ddce3597b5804421801392f5a11cf5",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0814641ffdd9899e2380df067baf35c87e5ddce3597b5804421801392f5a11cf5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a07d8d902db12b9f036c1e786d7617a5662b591cba0f7592f921e53df1ab092c67b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0828beb5af164061d88febb0080c740efbb3770c04a665d591bcde541bc7137468893182d4a6e8e6be7f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a02fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0814641ffdd9899e2380df067baf35c87e5ddce3597b5804421801392f5a11cf5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a07d8d902db12b9f036c1e786d7617a5662b591cba0f7592f921e53df1ab092c67b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a01829b1b52b382646feac45e42d86cee79acc9f53ed44c1d4c046a7988008cdc188a1e1882570db3042f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,42 +44,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7b5b492d8fadcff6d91722bd79ff037ebd176b0bae2260cee56c2da8bdbed28e",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7b5b492d8fadcff6d91722bd79ff037ebd176b0bae2260cee56c2da8bdbed28e",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07b5b492d8fadcff6d91722bd79ff037ebd176b0bae2260cee56c2da8bdbed28ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e09253f21eba12e2ea4107c8c988505c2598026317295b698cb16ef7038ca012",
+        "lastblockhash" : "0x18f6f96b754d650393674d1d77123150d48be326f31e5b1aef61bccb37386993",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
@@ -82,53 +87,53 @@
                     "0x03" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f548e7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762b719",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -136,36 +141,41 @@
         }
     },
     "callcodecallcodecall_110_SuicideEnd_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "4cdc16a7e4f73379991949ee883904424f8790d971a45df724ddd70b813d40e5",
-                    "mixHash" : "cc14821eb81ccae7ac4a64f2ae383eb7bfa781ebb73f4d935ddfe50e7b9a4ca1",
-                    "nonce" : "6e2c75c780bdbd8d",
+                    "hash" : "0xb7179d3d4864657f0440a61e43974273a6240ae5860091fa989a3b2a3555723c",
+                    "mixHash" : "0x9114feebdcec024466918349b5f971559c12f5d4ff3093ff1e4fe3d2a48dd0a7",
+                    "nonce" : "0x3a4ad20939a8d4de",
                     "number" : "0x01",
-                    "parentHash" : "2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
-                    "receiptTrie" : "7d8d902db12b9f036c1e786d7617a5662b591cba0f7592f921e53df1ab092c67",
-                    "stateRoot" : "814641ffdd9899e2380df067baf35c87e5ddce3597b5804421801392f5a11cf5",
+                    "parentHash" : "0x2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
+                    "receiptTrie" : "0x7d8d902db12b9f036c1e786d7617a5662b591cba0f7592f921e53df1ab092c67",
+                    "stateRoot" : "0x814641ffdd9899e2380df067baf35c87e5ddce3597b5804421801392f5a11cf5",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0814641ffdd9899e2380df067baf35c87e5ddce3597b5804421801392f5a11cf5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a07d8d902db12b9f036c1e786d7617a5662b591cba0f7592f921e53df1ab092c67b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0cc14821eb81ccae7ac4a64f2ae383eb7bfa781ebb73f4d935ddfe50e7b9a4ca1886e2c75c780bdbd8df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a02fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0814641ffdd9899e2380df067baf35c87e5ddce3597b5804421801392f5a11cf5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a07d8d902db12b9f036c1e786d7617a5662b591cba0f7592f921e53df1ab092c67b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a09114feebdcec024466918349b5f971559c12f5d4ff3093ff1e4fe3d2a48dd0a7883a4ad20939a8d4def862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -175,42 +185,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7b5b492d8fadcff6d91722bd79ff037ebd176b0bae2260cee56c2da8bdbed28e",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7b5b492d8fadcff6d91722bd79ff037ebd176b0bae2260cee56c2da8bdbed28e",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07b5b492d8fadcff6d91722bd79ff037ebd176b0bae2260cee56c2da8bdbed28ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4cdc16a7e4f73379991949ee883904424f8790d971a45df724ddd70b813d40e5",
+        "lastblockhash" : "0xb7179d3d4864657f0440a61e43974273a6240ae5860091fa989a3b2a3555723c",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
@@ -218,53 +228,53 @@
                     "0x03" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f548e7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762b719",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -272,36 +282,41 @@
         }
     },
     "callcodecallcodecall_110_SuicideEnd_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "808436807eb3e4d6e96169c1abbce55e5d7444f4030ecc179dd5ea67453e4f75",
-                    "mixHash" : "d055c7f009468e7320ad42550b1f8643e13071794aac44d5ae736ff4a0769a5f",
-                    "nonce" : "7f9f89fb14170fe7",
+                    "hash" : "0x6357478487c348c03ddb7064e4a0559b0e8e0ea67fff0cf977ecf680d9a1568c",
+                    "mixHash" : "0xdea624a95a82f10a1632b46ece2ab245daffe591b1a7ba29da9e3cc489132de7",
+                    "nonce" : "0x775092def9af3c22",
                     "number" : "0x01",
-                    "parentHash" : "2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
-                    "receiptTrie" : "148d2a83b8b1036884dd5a501b9633945191cd326770d3ecd974364f7137c6c7",
-                    "stateRoot" : "24f1562213397304f68b1d1991e7cf8e91cde71a9ead42f50eefe7ddafbb73c8",
+                    "parentHash" : "0x2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
+                    "receiptTrie" : "0x148d2a83b8b1036884dd5a501b9633945191cd326770d3ecd974364f7137c6c7",
+                    "stateRoot" : "0x24f1562213397304f68b1d1991e7cf8e91cde71a9ead42f50eefe7ddafbb73c8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa024f1562213397304f68b1d1991e7cf8e91cde71a9ead42f50eefe7ddafbb73c8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0148d2a83b8b1036884dd5a501b9633945191cd326770d3ecd974364f7137c6c7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0d055c7f009468e7320ad42550b1f8643e13071794aac44d5ae736ff4a0769a5f887f9f89fb14170fe7f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a02fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa024f1562213397304f68b1d1991e7cf8e91cde71a9ead42f50eefe7ddafbb73c8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0148d2a83b8b1036884dd5a501b9633945191cd326770d3ecd974364f7137c6c7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0dea624a95a82f10a1632b46ece2ab245daffe591b1a7ba29da9e3cc489132de788775092def9af3c22f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -311,42 +326,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7b5b492d8fadcff6d91722bd79ff037ebd176b0bae2260cee56c2da8bdbed28e",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7b5b492d8fadcff6d91722bd79ff037ebd176b0bae2260cee56c2da8bdbed28e",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07b5b492d8fadcff6d91722bd79ff037ebd176b0bae2260cee56c2da8bdbed28ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "808436807eb3e4d6e96169c1abbce55e5d7444f4030ecc179dd5ea67453e4f75",
+        "lastblockhash" : "0x6357478487c348c03ddb7064e4a0559b0e8e0ea67fff0cf977ecf680d9a1568c",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
@@ -354,53 +369,53 @@
                     "0x03" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52da3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762d25d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -408,36 +423,41 @@
         }
     },
     "callcodecallcodecall_110_SuicideEnd_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "b4747926c2f0003ac8aba1785ef77d93b5b9d016e9effe8a31ba58b71baf5442",
-                    "mixHash" : "2aa49090984ce4f113b1c4f53e2c418b0b4e520d493cc3b8d75700da83644b85",
-                    "nonce" : "e0b70a3c09bd99db",
+                    "hash" : "0xeb26c9fd58c73821097bf02143f550677598aee3812a4687792be84549cbb988",
+                    "mixHash" : "0xd18216b9c369b754091592342d175e6c912808abb8eb56751ea5cc715f44d1f7",
+                    "nonce" : "0x97abfb86a254548c",
                     "number" : "0x01",
-                    "parentHash" : "2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
-                    "receiptTrie" : "148d2a83b8b1036884dd5a501b9633945191cd326770d3ecd974364f7137c6c7",
-                    "stateRoot" : "24f1562213397304f68b1d1991e7cf8e91cde71a9ead42f50eefe7ddafbb73c8",
+                    "parentHash" : "0x2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
+                    "receiptTrie" : "0x148d2a83b8b1036884dd5a501b9633945191cd326770d3ecd974364f7137c6c7",
+                    "stateRoot" : "0x24f1562213397304f68b1d1991e7cf8e91cde71a9ead42f50eefe7ddafbb73c8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa024f1562213397304f68b1d1991e7cf8e91cde71a9ead42f50eefe7ddafbb73c8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0148d2a83b8b1036884dd5a501b9633945191cd326770d3ecd974364f7137c6c7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a02aa49090984ce4f113b1c4f53e2c418b0b4e520d493cc3b8d75700da83644b8588e0b70a3c09bd99dbf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a02fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa024f1562213397304f68b1d1991e7cf8e91cde71a9ead42f50eefe7ddafbb73c8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0148d2a83b8b1036884dd5a501b9633945191cd326770d3ecd974364f7137c6c7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0d18216b9c369b754091592342d175e6c912808abb8eb56751ea5cc715f44d1f78897abfb86a254548cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -447,42 +467,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7b5b492d8fadcff6d91722bd79ff037ebd176b0bae2260cee56c2da8bdbed28e",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7b5b492d8fadcff6d91722bd79ff037ebd176b0bae2260cee56c2da8bdbed28e",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07b5b492d8fadcff6d91722bd79ff037ebd176b0bae2260cee56c2da8bdbed28ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b4747926c2f0003ac8aba1785ef77d93b5b9d016e9effe8a31ba58b71baf5442",
+        "lastblockhash" : "0xeb26c9fd58c73821097bf02143f550677598aee3812a4687792be84549cbb988",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
@@ -490,53 +510,201 @@
                     "0x03" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52da3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762d25d",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x7df43a3d8d8e93f501493fb9ca8bea6e9bed919ee8a3e2a39d4fe62faf975044",
+                    "mixHash" : "0xac01dd0f75bc1ce41dd95f157ca6559ee85e2b56c8a9659428fb1369557548e9",
+                    "nonce" : "0x9a430a00461a86d3",
+                    "number" : "0x01",
+                    "parentHash" : "0x2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0xffbc83c6d750816c9acb6e8a472a7402a91dc29d2e74c32037b4c615840d6e14",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a02fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffbc83c6d750816c9acb6e8a472a7402a91dc29d2e74c32037b4c615840d6e14a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0ac01dd0f75bc1ce41dd95f157ca6559ee85e2b56c8a9659428fb1369557548e9889a430a00461a86d3f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x7df43a3d8d8e93f501493fb9ca8bea6e9bed919ee8a3e2a39d4fe62faf975044",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle.json
deleted file mode 100644
index 40bcfb96b..000000000
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle.json
+++ /dev/null
@@ -1,542 +0,0 @@
-{
-    "callcodecallcodecall_110_SuicideMiddle_d0g0v0_EIP150" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c7",
-                    "hash" : "0e72ad2a7c572f2b4fbf541b9851765cea3b839af920b76cd1bc90aff01fb95b",
-                    "mixHash" : "bca6d4cfee330b6486f52cce8cb1463471b54e0e76427e094316918d73b4bcda",
-                    "nonce" : "138b56327fa9ee9a",
-                    "number" : "0x01",
-                    "parentHash" : "a3984629d8d5ab6cda0a4841b2f7d90dde9d60c311226b881ca88ddaed8784f0",
-                    "receiptTrie" : "2abc497bc32859cec4258bb8cb2ad177020fd2593dbe0b43ecb90f763c56a38c",
-                    "stateRoot" : "601081e1fdb56e699360af227bdd2e3fd46b1bdf4f98f2069ead486ad8e5c546",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0a3984629d8d5ab6cda0a4841b2f7d90dde9d60c311226b881ca88ddaed8784f0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0601081e1fdb56e699360af227bdd2e3fd46b1bdf4f98f2069ead486ad8e5c546a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a02abc497bc32859cec4258bb8cb2ad177020fd2593dbe0b43ecb90f763c56a38cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0bca6d4cfee330b6486f52cce8cb1463471b54e0e76427e094316918d73b4bcda88138b56327fa9ee9af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "a3984629d8d5ab6cda0a4841b2f7d90dde9d60c311226b881ca88ddaed8784f0",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "985c45f2f1c908a640d0f850fad5c24fdecb13d2fca0410c646d30ebdd8d952a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0985c45f2f1c908a640d0f850fad5c24fdecb13d2fca0410c646d30ebdd8d952aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0e72ad2a7c572f2b4fbf541b9851765cea3b839af920b76cd1bc90aff01fb95b",
-        "network" : "EIP150",
-        "postState" : {
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635639",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcodecall_110_SuicideMiddle_d0g0v0_EIP158" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c7",
-                    "hash" : "933d9644552e561956ea4905121bacf05ef85a3c4cef04e617f24330d149ce8d",
-                    "mixHash" : "0c1ddbfc5068b888b5beec0269ed74c516ca7ab154276716e097ee1e3aef3898",
-                    "nonce" : "d39bb97a99d5d3d9",
-                    "number" : "0x01",
-                    "parentHash" : "a3984629d8d5ab6cda0a4841b2f7d90dde9d60c311226b881ca88ddaed8784f0",
-                    "receiptTrie" : "2abc497bc32859cec4258bb8cb2ad177020fd2593dbe0b43ecb90f763c56a38c",
-                    "stateRoot" : "601081e1fdb56e699360af227bdd2e3fd46b1bdf4f98f2069ead486ad8e5c546",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0a3984629d8d5ab6cda0a4841b2f7d90dde9d60c311226b881ca88ddaed8784f0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0601081e1fdb56e699360af227bdd2e3fd46b1bdf4f98f2069ead486ad8e5c546a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a02abc497bc32859cec4258bb8cb2ad177020fd2593dbe0b43ecb90f763c56a38cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a00c1ddbfc5068b888b5beec0269ed74c516ca7ab154276716e097ee1e3aef389888d39bb97a99d5d3d9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "a3984629d8d5ab6cda0a4841b2f7d90dde9d60c311226b881ca88ddaed8784f0",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "985c45f2f1c908a640d0f850fad5c24fdecb13d2fca0410c646d30ebdd8d952a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0985c45f2f1c908a640d0f850fad5c24fdecb13d2fca0410c646d30ebdd8d952aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "933d9644552e561956ea4905121bacf05ef85a3c4cef04e617f24330d149ce8d",
-        "network" : "EIP158",
-        "postState" : {
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635639",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcodecall_110_SuicideMiddle_d0g0v0_Frontier" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9117",
-                    "hash" : "b3f853e34dd3f1e57ccc428ae857b24d8836e5859245de67085f47249f9d24fa",
-                    "mixHash" : "7d6263e6526f2df819df7933f69e808ed00eabe7bf02a07e8d707b638f43f8d3",
-                    "nonce" : "efb366abf73ec279",
-                    "number" : "0x01",
-                    "parentHash" : "a3984629d8d5ab6cda0a4841b2f7d90dde9d60c311226b881ca88ddaed8784f0",
-                    "receiptTrie" : "d0e53c0f21a451c9b06b6b563a6a084bd4687b32cadba4ed4b036ed125538f02",
-                    "stateRoot" : "c339c94977691023b4e473c63973ad7cba2c90b40445673901f85f8c44f29432",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0a3984629d8d5ab6cda0a4841b2f7d90dde9d60c311226b881ca88ddaed8784f0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c339c94977691023b4e473c63973ad7cba2c90b40445673901f85f8c44f29432a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d0e53c0f21a451c9b06b6b563a6a084bd4687b32cadba4ed4b036ed125538f02b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a07d6263e6526f2df819df7933f69e808ed00eabe7bf02a07e8d707b638f43f8d388efb366abf73ec279f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "a3984629d8d5ab6cda0a4841b2f7d90dde9d60c311226b881ca88ddaed8784f0",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "985c45f2f1c908a640d0f850fad5c24fdecb13d2fca0410c646d30ebdd8d952a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0985c45f2f1c908a640d0f850fad5c24fdecb13d2fca0410c646d30ebdd8d952aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b3f853e34dd3f1e57ccc428ae857b24d8836e5859245de67085f47249f9d24fa",
-        "network" : "Frontier",
-        "postState" : {
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49117",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636ee9",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcodecall_110_SuicideMiddle_d0g0v0_Homestead" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9117",
-                    "hash" : "d6875421f72b76d76721fefe924ab96845ef5aebb3fb5745967d8800b0564bb3",
-                    "mixHash" : "3a932f5b45cd919ef3b6c260ded27945a30d6ae52d79e7af7e3e9c6e47a50bcf",
-                    "nonce" : "3bfa2c597824395c",
-                    "number" : "0x01",
-                    "parentHash" : "a3984629d8d5ab6cda0a4841b2f7d90dde9d60c311226b881ca88ddaed8784f0",
-                    "receiptTrie" : "d0e53c0f21a451c9b06b6b563a6a084bd4687b32cadba4ed4b036ed125538f02",
-                    "stateRoot" : "c339c94977691023b4e473c63973ad7cba2c90b40445673901f85f8c44f29432",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0a3984629d8d5ab6cda0a4841b2f7d90dde9d60c311226b881ca88ddaed8784f0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c339c94977691023b4e473c63973ad7cba2c90b40445673901f85f8c44f29432a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d0e53c0f21a451c9b06b6b563a6a084bd4687b32cadba4ed4b036ed125538f02b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a03a932f5b45cd919ef3b6c260ded27945a30d6ae52d79e7af7e3e9c6e47a50bcf883bfa2c597824395cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "a3984629d8d5ab6cda0a4841b2f7d90dde9d60c311226b881ca88ddaed8784f0",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "985c45f2f1c908a640d0f850fad5c24fdecb13d2fca0410c646d30ebdd8d952a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0985c45f2f1c908a640d0f850fad5c24fdecb13d2fca0410c646d30ebdd8d952aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d6875421f72b76d76721fefe924ab96845ef5aebb3fb5745967d8800b0564bb3",
-        "network" : "Homestead",
-        "postState" : {
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49117",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636ee9",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle_d0g0v0.json
new file mode 100644
index 000000000..556a6228b
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle_d0g0v0.json
@@ -0,0 +1,709 @@
+{
+    "callcodecallcodecall_110_SuicideMiddle_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xb521d2be2b5125647cf455147dc24f17310a5f101323d894507104c64994cb7b",
+                    "mixHash" : "0x40c66e295a5776b89b0c2f4fa91cdda0e78a1b0240fe03b6362c8df4c0f6f56f",
+                    "nonce" : "0x64bc0ca4c48a9116",
+                    "number" : "0x01",
+                    "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+                    "receiptTrie" : "0xf314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449",
+                    "stateRoot" : "0x6160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dca",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dcaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a040c66e295a5776b89b0c2f4fa91cdda0e78a1b0240fe03b6362c8df4c0f6f56f8864bc0ca4c48a9116f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xb521d2be2b5125647cf455147dc24f17310a5f101323d894507104c64994cb7b",
+        "network" : "EIP150",
+        "postState" : {
+            "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_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x2e711e4b77da29ef5335394535dfff1a9506eff4146bc010b7c766bf14c29110",
+                    "mixHash" : "0x618d6fb1ac3231e46206925f0c06645b4ea1eb26091ad62a68ea8e1a138451eb",
+                    "nonce" : "0x9e2f0e4e63c4823b",
+                    "number" : "0x01",
+                    "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+                    "receiptTrie" : "0xf314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449",
+                    "stateRoot" : "0x6160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dca",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dcaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0618d6fb1ac3231e46206925f0c06645b4ea1eb26091ad62a68ea8e1a138451eb889e2f0e4e63c4823bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x2e711e4b77da29ef5335394535dfff1a9506eff4146bc010b7c766bf14c29110",
+        "network" : "EIP158",
+        "postState" : {
+            "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_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_SuicideMiddle_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x9117",
+                    "hash" : "0xb2bd61c9f29950e2ca27ae027bc6e4bf6ab6039f515ee6d75880c1ea5d78fb84",
+                    "mixHash" : "0x2e1851d9018d472bf46e4ef92c0ce8c4732590127920a5c6b53a06c31140df59",
+                    "nonce" : "0xe740067b2c991537",
+                    "number" : "0x01",
+                    "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+                    "receiptTrie" : "0x9968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730",
+                    "stateRoot" : "0x440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a02e1851d9018d472bf46e4ef92c0ce8c4732590127920a5c6b53a06c31140df5988e740067b2c991537f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xb2bd61c9f29950e2ca27ae027bc6e4bf6ab6039f515ee6d75880c1ea5d78fb84",
+        "network" : "Frontier",
+        "postState" : {
+            "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" : "0x4563918244f49117",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7636ee9",
+                "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_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_SuicideMiddle_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x9117",
+                    "hash" : "0xb15e39545d5c67b5773d72929cc130b2a7eb5d15ec0f6fdf972a237442bb4b6e",
+                    "mixHash" : "0x9fc4b4e6200b56a59175045b1528e89caaef86b3f4bf5151b856fb273d78d3e2",
+                    "nonce" : "0xf826a8498954b76a",
+                    "number" : "0x01",
+                    "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+                    "receiptTrie" : "0x9968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730",
+                    "stateRoot" : "0x440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a09fc4b4e6200b56a59175045b1528e89caaef86b3f4bf5151b856fb273d78d3e288f826a8498954b76af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xb15e39545d5c67b5773d72929cc130b2a7eb5d15ec0f6fdf972a237442bb4b6e",
+        "network" : "Homestead",
+        "postState" : {
+            "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" : "0x4563918244f49117",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7636ee9",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x75921d39bf59b8853527ad3fb2b13d0c4ad5066e449154e7d5432add6b07e52e",
+                    "mixHash" : "0xd3bddd5ec9c17f7c338d1adf8392ff8c1195c655829b276a60faf0503ebf423e",
+                    "nonce" : "0xf72e71772ce1a9cd",
+                    "number" : "0x01",
+                    "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x4b16f02d8f4bd5f41f0c7e0c9117d41092c750a9f779c862b99ec2c557037cea",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b16f02d8f4bd5f41f0c7e0c9117d41092c750a9f779c862b99ec2c557037ceaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0d3bddd5ec9c17f7c338d1adf8392ff8c1195c655829b276a60faf0503ebf423e88f72e71772ce1a9cdf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x75921d39bf59b8853527ad3fb2b13d0c4ad5066e449154e7d5432add6b07e52e",
+        "network" : "Metropolis",
+        "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" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_d0g0v0.json
index 0b8814fc1..871c4fe3e 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcodecall_110_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "39d22c2d28ff607bcb376c57b9766b77a8dc8310fb23b291ced84ee1534bd82e",
-                    "mixHash" : "e5be83df261f96fce6eaddb7b708619a2620a7e680528a68e68323a1eb3f022a",
-                    "nonce" : "4237f0640d1229b5",
+                    "hash" : "0x8ce2fed0411b73fd4e0f91f78da107bcca4ba0f75947792f65de1e81baeb949a",
+                    "mixHash" : "0xcad782471ac7106f61c22a4ce66b662a0bc223d54399a6d98cea95be4494dcfd",
+                    "nonce" : "0x36d143308f6a008e",
                     "number" : "0x01",
-                    "parentHash" : "c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
-                    "receiptTrie" : "0533c8522bcff14998731d57b85f717ca7323c79cd4623e9f373583e26d3a9a7",
-                    "stateRoot" : "aaa37836fac4cc48dbf79a1f5f295d6fabdc5594917a37a3ce2de697f3a1b48a",
+                    "parentHash" : "0xc3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
+                    "receiptTrie" : "0x0533c8522bcff14998731d57b85f717ca7323c79cd4623e9f373583e26d3a9a7",
+                    "stateRoot" : "0xaaa37836fac4cc48dbf79a1f5f295d6fabdc5594917a37a3ce2de697f3a1b48a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aaa37836fac4cc48dbf79a1f5f295d6fabdc5594917a37a3ce2de697f3a1b48aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a00533c8522bcff14998731d57b85f717ca7323c79cd4623e9f373583e26d3a9a7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0e5be83df261f96fce6eaddb7b708619a2620a7e680528a68e68323a1eb3f022a884237f0640d1229b5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aaa37836fac4cc48dbf79a1f5f295d6fabdc5594917a37a3ce2de697f3a1b48aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a00533c8522bcff14998731d57b85f717ca7323c79cd4623e9f373583e26d3a9a7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0cad782471ac7106f61c22a4ce66b662a0bc223d54399a6d98cea95be4494dcfd8836d143308f6a008ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7cd559cae30f9fb09a4a32a1a9e145158a74433930d83bec0d2f08bb82dafbda",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7cd559cae30f9fb09a4a32a1a9e145158a74433930d83bec0d2f08bb82dafbda",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07cd559cae30f9fb09a4a32a1a9e145158a74433930d83bec0d2f08bb82dafbdaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "39d22c2d28ff607bcb376c57b9766b77a8dc8310fb23b291ced84ee1534bd82e",
+        "lastblockhash" : "0x8ce2fed0411b73fd4e0f91f78da107bcca4ba0f75947792f65de1e81baeb949a",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffd",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -70,21 +75,21 @@
                     "0x02" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x03",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
@@ -99,53 +104,53 @@
                     "0x07" : "0x03"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f804a3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ffb5d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -153,36 +158,41 @@
         }
     },
     "callcodecallcodecall_110_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "16149fed5bf01fb4a3c9ae9814487e3059041f8a0d0e31cb3b99924bc49b5fa4",
-                    "mixHash" : "6496c2ae6dfe47354ea8a7af48c08738321e35fe3fbd95fcb3672a49e0a126ca",
-                    "nonce" : "3def33b69322bef5",
+                    "hash" : "0x8c20183a0ade4bb47fc3f1fa7dafaad02fa1ff39d33150ada85095f8d80eb660",
+                    "mixHash" : "0xc9ceb67eb02942b22afee1e45747a81367e3ad11d801bce8184b33a44272a6ac",
+                    "nonce" : "0x709c9c2a0d9730d5",
                     "number" : "0x01",
-                    "parentHash" : "c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
-                    "receiptTrie" : "0533c8522bcff14998731d57b85f717ca7323c79cd4623e9f373583e26d3a9a7",
-                    "stateRoot" : "aaa37836fac4cc48dbf79a1f5f295d6fabdc5594917a37a3ce2de697f3a1b48a",
+                    "parentHash" : "0xc3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
+                    "receiptTrie" : "0x0533c8522bcff14998731d57b85f717ca7323c79cd4623e9f373583e26d3a9a7",
+                    "stateRoot" : "0xaaa37836fac4cc48dbf79a1f5f295d6fabdc5594917a37a3ce2de697f3a1b48a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aaa37836fac4cc48dbf79a1f5f295d6fabdc5594917a37a3ce2de697f3a1b48aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a00533c8522bcff14998731d57b85f717ca7323c79cd4623e9f373583e26d3a9a7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a06496c2ae6dfe47354ea8a7af48c08738321e35fe3fbd95fcb3672a49e0a126ca883def33b69322bef5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aaa37836fac4cc48dbf79a1f5f295d6fabdc5594917a37a3ce2de697f3a1b48aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a00533c8522bcff14998731d57b85f717ca7323c79cd4623e9f373583e26d3a9a7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0c9ceb67eb02942b22afee1e45747a81367e3ad11d801bce8184b33a44272a6ac88709c9c2a0d9730d5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -192,28 +202,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7cd559cae30f9fb09a4a32a1a9e145158a74433930d83bec0d2f08bb82dafbda",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7cd559cae30f9fb09a4a32a1a9e145158a74433930d83bec0d2f08bb82dafbda",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07cd559cae30f9fb09a4a32a1a9e145158a74433930d83bec0d2f08bb82dafbdaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "16149fed5bf01fb4a3c9ae9814487e3059041f8a0d0e31cb3b99924bc49b5fa4",
+        "lastblockhash" : "0x8c20183a0ade4bb47fc3f1fa7dafaad02fa1ff39d33150ada85095f8d80eb660",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffd",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -223,21 +233,21 @@
                     "0x02" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x03",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
@@ -252,53 +262,53 @@
                     "0x07" : "0x03"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f804a3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ffb5d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -306,36 +316,41 @@
         }
     },
     "callcodecallcodecall_110_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "91f6c5eb7e85074e5261020bd035183cbf274b6939aabfa2b9aaa7b69fe44062",
-                    "mixHash" : "6bf7f28e778e5a17a4171d9b415a944ae020d505423a526507d03d295bfbb1b2",
-                    "nonce" : "3807663d6d7dde04",
+                    "hash" : "0xebdf06af4d9ff633e2afb94e292318acd753ce8112d3a812b67fa612d1cbc9d3",
+                    "mixHash" : "0xedc0055f8785a2325a40533e40cd663dcfd1d5a7c9fcbe38cdd588c003841624",
+                    "nonce" : "0x1aac2f92c4a24076",
                     "number" : "0x01",
-                    "parentHash" : "c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
-                    "receiptTrie" : "2a4d5e38079c89454f77ab7ad12f674da253d493b97a21aeb86a42bc8fd0dd2d",
-                    "stateRoot" : "73db7bdc16e9640aec17f023655c2a128a9b018b8b4b329febbdb961e0a030ac",
+                    "parentHash" : "0xc3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
+                    "receiptTrie" : "0x2a4d5e38079c89454f77ab7ad12f674da253d493b97a21aeb86a42bc8fd0dd2d",
+                    "stateRoot" : "0x73db7bdc16e9640aec17f023655c2a128a9b018b8b4b329febbdb961e0a030ac",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073db7bdc16e9640aec17f023655c2a128a9b018b8b4b329febbdb961e0a030aca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a02a4d5e38079c89454f77ab7ad12f674da253d493b97a21aeb86a42bc8fd0dd2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a06bf7f28e778e5a17a4171d9b415a944ae020d505423a526507d03d295bfbb1b2883807663d6d7dde04f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073db7bdc16e9640aec17f023655c2a128a9b018b8b4b329febbdb961e0a030aca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a02a4d5e38079c89454f77ab7ad12f674da253d493b97a21aeb86a42bc8fd0dd2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0edc0055f8785a2325a40533e40cd663dcfd1d5a7c9fcbe38cdd588c003841624881aac2f92c4a24076f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -345,28 +360,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7cd559cae30f9fb09a4a32a1a9e145158a74433930d83bec0d2f08bb82dafbda",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7cd559cae30f9fb09a4a32a1a9e145158a74433930d83bec0d2f08bb82dafbda",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07cd559cae30f9fb09a4a32a1a9e145158a74433930d83bec0d2f08bb82dafbdaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "91f6c5eb7e85074e5261020bd035183cbf274b6939aabfa2b9aaa7b69fe44062",
+        "lastblockhash" : "0xebdf06af4d9ff633e2afb94e292318acd753ce8112d3a812b67fa612d1cbc9d3",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffd",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -376,21 +391,21 @@
                     "0x02" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x03",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
@@ -405,53 +420,53 @@
                     "0x07" : "0x03"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7fce7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7600319",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -459,36 +474,41 @@
         }
     },
     "callcodecallcodecall_110_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "0f03997d6bec33b9e264c1409e39f7cd3b83342e103d31d0612953a624bff428",
-                    "mixHash" : "e39921080d1540b732f51ca36bd0babf7575c87b8192ed214fd608c55976833c",
-                    "nonce" : "42c2c5c65d00573b",
+                    "hash" : "0x57b14a0af1b5ba03d43eeb45051a4f719e6980a5e7cd90c10eba5fde6cf12f91",
+                    "mixHash" : "0xe941b46682e7c792dbba01e56fe9c07baaaf6c182e5f7c9a6955f783fb471743",
+                    "nonce" : "0x8245f6b2c386e99a",
                     "number" : "0x01",
-                    "parentHash" : "c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
-                    "receiptTrie" : "2a4d5e38079c89454f77ab7ad12f674da253d493b97a21aeb86a42bc8fd0dd2d",
-                    "stateRoot" : "73db7bdc16e9640aec17f023655c2a128a9b018b8b4b329febbdb961e0a030ac",
+                    "parentHash" : "0xc3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
+                    "receiptTrie" : "0x2a4d5e38079c89454f77ab7ad12f674da253d493b97a21aeb86a42bc8fd0dd2d",
+                    "stateRoot" : "0x73db7bdc16e9640aec17f023655c2a128a9b018b8b4b329febbdb961e0a030ac",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073db7bdc16e9640aec17f023655c2a128a9b018b8b4b329febbdb961e0a030aca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a02a4d5e38079c89454f77ab7ad12f674da253d493b97a21aeb86a42bc8fd0dd2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0e39921080d1540b732f51ca36bd0babf7575c87b8192ed214fd608c55976833c8842c2c5c65d00573bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073db7bdc16e9640aec17f023655c2a128a9b018b8b4b329febbdb961e0a030aca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a02a4d5e38079c89454f77ab7ad12f674da253d493b97a21aeb86a42bc8fd0dd2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0e941b46682e7c792dbba01e56fe9c07baaaf6c182e5f7c9a6955f783fb471743888245f6b2c386e99af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -498,28 +518,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7cd559cae30f9fb09a4a32a1a9e145158a74433930d83bec0d2f08bb82dafbda",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7cd559cae30f9fb09a4a32a1a9e145158a74433930d83bec0d2f08bb82dafbda",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07cd559cae30f9fb09a4a32a1a9e145158a74433930d83bec0d2f08bb82dafbdaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0f03997d6bec33b9e264c1409e39f7cd3b83342e103d31d0612953a624bff428",
+        "lastblockhash" : "0x57b14a0af1b5ba03d43eeb45051a4f719e6980a5e7cd90c10eba5fde6cf12f91",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffd",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -529,21 +549,21 @@
                     "0x02" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x03",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
@@ -558,53 +578,218 @@
                     "0x07" : "0x03"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7fce7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7600319",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0x6ff11e5187e5e2330ac06e7730534bb4595b3637570fd56405afb7ac8451bab1",
+                    "mixHash" : "0x54c101c7f12d5d417b289e89af28536fa35a7fb4e3801fe7442cad2e871c2beb",
+                    "nonce" : "0x6f1be6e9657e775f",
+                    "number" : "0x01",
+                    "parentHash" : "0xc3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0x4fffd34e34ab32f65897f392bc35e203feda67ae01e4661c761283b3eefc27a1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fffd34e34ab32f65897f392bc35e203feda67ae01e4661c761283b3eefc27a1a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a054c101c7f12d5d417b289e89af28536fa35a7fb4e3801fe7442cad2e871c2beb886f1be6e9657e775ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x6ff11e5187e5e2330ac06e7730534bb4595b3637570fd56405afb7ac8451bab1",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0.json
index 84afa1688..a14b2df8f 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcodecall_ABCB_RECURSIVE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "19d0e53004b5aea93b0754571de47bf8995d2e190d48fb5e12392aa562408ff4",
-                    "mixHash" : "9a9ba3f7bb8df7b5e471ad222a481488ac76117af05f260da911ce6dfd36648d",
-                    "nonce" : "c163906fb346dc44",
+                    "hash" : "0xc0904c3746dc9a0f093e83a239dd0ebebb697aecd309d2ca2607bfb431608605",
+                    "mixHash" : "0x8fc0ab116e00f9976fc5319f507550dabe7977b9a0abd7e1806a221156080be1",
+                    "nonce" : "0xc30dcf1e713be437",
                     "number" : "0x01",
-                    "parentHash" : "e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
-                    "receiptTrie" : "062404de97ac4941fccc862cfe4e75d56e452aa09a40ee40ea82d544f5f537c3",
-                    "stateRoot" : "5501b3d0e4c67bb29c25834b0dbc1437bf3973130f70d0376c2f50142907aabc",
+                    "parentHash" : "0xe1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
+                    "receiptTrie" : "0x062404de97ac4941fccc862cfe4e75d56e452aa09a40ee40ea82d544f5f537c3",
+                    "stateRoot" : "0x5501b3d0e4c67bb29c25834b0dbc1437bf3973130f70d0376c2f50142907aabc",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05501b3d0e4c67bb29c25834b0dbc1437bf3973130f70d0376c2f50142907aabca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0062404de97ac4941fccc862cfe4e75d56e452aa09a40ee40ea82d544f5f537c3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a09a9ba3f7bb8df7b5e471ad222a481488ac76117af05f260da911ce6dfd36648d88c163906fb346dc44f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05501b3d0e4c67bb29c25834b0dbc1437bf3973130f70d0376c2f50142907aabca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0062404de97ac4941fccc862cfe4e75d56e452aa09a40ee40ea82d544f5f537c3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a08fc0ab116e00f9976fc5319f507550dabe7977b9a0abd7e1806a221156080be188c30dcf1e713be437f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "521ed360ad8368bec1e864e44b0a9c314931631069cdcdc5381b5bf853f37dbc",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x521ed360ad8368bec1e864e44b0a9c314931631069cdcdc5381b5bf853f37dbc",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0521ed360ad8368bec1e864e44b0a9c314931631069cdcdc5381b5bf853f37dbca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "19d0e53004b5aea93b0754571de47bf8995d2e190d48fb5e12392aa562408ff4",
+        "lastblockhash" : "0xc0904c3746dc9a0f093e83a239dd0ebebb697aecd309d2ca2607bfb431608605",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
@@ -69,60 +74,60 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fcab7e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5482",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -130,36 +135,41 @@
         }
     },
     "callcodecallcodecall_ABCB_RECURSIVE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "7c22abe796622612486342eb296f20638d3567af868b7516159de9a32f637304",
-                    "mixHash" : "eab6fcc2c40a51c8e25b1704e9f3b08c1e3a4fd66e668d5cfc40bbf281eb697b",
-                    "nonce" : "89096da16b216041",
+                    "hash" : "0xb3cf868f325f6addad6e8b45434bb46733c75178a01cc8d7cf6f0f35ffb2c6cb",
+                    "mixHash" : "0xdb9ddb88958b5c296beb6b7750c3df82c49c25518c7753097a49de1aa024be15",
+                    "nonce" : "0x140131088c0ce97e",
                     "number" : "0x01",
-                    "parentHash" : "e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
-                    "receiptTrie" : "062404de97ac4941fccc862cfe4e75d56e452aa09a40ee40ea82d544f5f537c3",
-                    "stateRoot" : "5501b3d0e4c67bb29c25834b0dbc1437bf3973130f70d0376c2f50142907aabc",
+                    "parentHash" : "0xe1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
+                    "receiptTrie" : "0x062404de97ac4941fccc862cfe4e75d56e452aa09a40ee40ea82d544f5f537c3",
+                    "stateRoot" : "0x5501b3d0e4c67bb29c25834b0dbc1437bf3973130f70d0376c2f50142907aabc",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05501b3d0e4c67bb29c25834b0dbc1437bf3973130f70d0376c2f50142907aabca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0062404de97ac4941fccc862cfe4e75d56e452aa09a40ee40ea82d544f5f537c3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0eab6fcc2c40a51c8e25b1704e9f3b08c1e3a4fd66e668d5cfc40bbf281eb697b8889096da16b216041f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05501b3d0e4c67bb29c25834b0dbc1437bf3973130f70d0376c2f50142907aabca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0062404de97ac4941fccc862cfe4e75d56e452aa09a40ee40ea82d544f5f537c3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0db9ddb88958b5c296beb6b7750c3df82c49c25518c7753097a49de1aa024be1588140131088c0ce97ef863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -169,28 +179,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "521ed360ad8368bec1e864e44b0a9c314931631069cdcdc5381b5bf853f37dbc",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x521ed360ad8368bec1e864e44b0a9c314931631069cdcdc5381b5bf853f37dbc",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0521ed360ad8368bec1e864e44b0a9c314931631069cdcdc5381b5bf853f37dbca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7c22abe796622612486342eb296f20638d3567af868b7516159de9a32f637304",
+        "lastblockhash" : "0xb3cf868f325f6addad6e8b45434bb46733c75178a01cc8d7cf6f0f35ffb2c6cb",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
@@ -199,60 +209,60 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fcab7e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5482",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -260,36 +270,41 @@
         }
     },
     "callcodecallcodecall_ABCB_RECURSIVE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "d91fe0895dfb16175457af362157da65fa741e824f211a20adbe0ba6fab4873a",
-                    "mixHash" : "c7ccfcb0522956963aa1536a644826bc9c0134d716062b26f2a07e802b3589f2",
-                    "nonce" : "fb32e387fbdb317f",
+                    "hash" : "0x1db65602d2c6f6d150e88c33e930c6cec088ef274036e216ab829a4902374808",
+                    "mixHash" : "0xde964c6cb31b5d883f33b3b356b1c1ae0b57cfe1d55a8356530e3a2500e21a4d",
+                    "nonce" : "0xd3e802c9363c4404",
                     "number" : "0x01",
-                    "parentHash" : "e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
-                    "receiptTrie" : "1a6ad1effdc938e3366aca3fa6af12b04febfaefdae886f63a507b0fc75a0016",
-                    "stateRoot" : "e2aae56eb9330d8e33d0dd4543c39b0bfc5c2089cd611541c2bb023fdb3c795d",
+                    "parentHash" : "0xe1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
+                    "receiptTrie" : "0x1a6ad1effdc938e3366aca3fa6af12b04febfaefdae886f63a507b0fc75a0016",
+                    "stateRoot" : "0xe2aae56eb9330d8e33d0dd4543c39b0bfc5c2089cd611541c2bb023fdb3c795d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2aae56eb9330d8e33d0dd4543c39b0bfc5c2089cd611541c2bb023fdb3c795da06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a01a6ad1effdc938e3366aca3fa6af12b04febfaefdae886f63a507b0fc75a0016b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0c7ccfcb0522956963aa1536a644826bc9c0134d716062b26f2a07e802b3589f288fb32e387fbdb317ff863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2aae56eb9330d8e33d0dd4543c39b0bfc5c2089cd611541c2bb023fdb3c795da06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a01a6ad1effdc938e3366aca3fa6af12b04febfaefdae886f63a507b0fc75a0016b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0de964c6cb31b5d883f33b3b356b1c1ae0b57cfe1d55a8356530e3a2500e21a4d88d3e802c9363c4404f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -299,28 +314,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "521ed360ad8368bec1e864e44b0a9c314931631069cdcdc5381b5bf853f37dbc",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x521ed360ad8368bec1e864e44b0a9c314931631069cdcdc5381b5bf853f37dbc",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0521ed360ad8368bec1e864e44b0a9c314931631069cdcdc5381b5bf853f37dbca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d91fe0895dfb16175457af362157da65fa741e824f211a20adbe0ba6fab4873a",
+        "lastblockhash" : "0x1db65602d2c6f6d150e88c33e930c6cec088ef274036e216ab829a4902374808",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
@@ -329,60 +344,60 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fca3c2",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5c3e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -390,36 +405,41 @@
         }
     },
     "callcodecallcodecall_ABCB_RECURSIVE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "7946beded91601cccfe30db248efae7df8ba08e990c3484caa6c1310d5280d94",
-                    "mixHash" : "c53a907cd2f3373a63004b60016c1dcec3e909cc3d8e081d1526e176bcb78443",
-                    "nonce" : "ff16a807a9daf880",
+                    "hash" : "0x83efa672bf6141ebdc92aa02629ac2e1648d74a64e731af6f70dcac39de4d3fb",
+                    "mixHash" : "0xd8dc20c96200315ae2de1523a8e3e356dd84f159eec34dec5e449405f90c01db",
+                    "nonce" : "0xcb8be901c05b25df",
                     "number" : "0x01",
-                    "parentHash" : "e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
-                    "receiptTrie" : "1a6ad1effdc938e3366aca3fa6af12b04febfaefdae886f63a507b0fc75a0016",
-                    "stateRoot" : "e2aae56eb9330d8e33d0dd4543c39b0bfc5c2089cd611541c2bb023fdb3c795d",
+                    "parentHash" : "0xe1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
+                    "receiptTrie" : "0x1a6ad1effdc938e3366aca3fa6af12b04febfaefdae886f63a507b0fc75a0016",
+                    "stateRoot" : "0xe2aae56eb9330d8e33d0dd4543c39b0bfc5c2089cd611541c2bb023fdb3c795d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2aae56eb9330d8e33d0dd4543c39b0bfc5c2089cd611541c2bb023fdb3c795da06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a01a6ad1effdc938e3366aca3fa6af12b04febfaefdae886f63a507b0fc75a0016b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0c53a907cd2f3373a63004b60016c1dcec3e909cc3d8e081d1526e176bcb7844388ff16a807a9daf880f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2aae56eb9330d8e33d0dd4543c39b0bfc5c2089cd611541c2bb023fdb3c795da06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a01a6ad1effdc938e3366aca3fa6af12b04febfaefdae886f63a507b0fc75a0016b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0d8dc20c96200315ae2de1523a8e3e356dd84f159eec34dec5e449405f90c01db88cb8be901c05b25dff863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -429,28 +449,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "521ed360ad8368bec1e864e44b0a9c314931631069cdcdc5381b5bf853f37dbc",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x521ed360ad8368bec1e864e44b0a9c314931631069cdcdc5381b5bf853f37dbc",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0521ed360ad8368bec1e864e44b0a9c314931631069cdcdc5381b5bf853f37dbca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7946beded91601cccfe30db248efae7df8ba08e990c3484caa6c1310d5280d94",
+        "lastblockhash" : "0x83efa672bf6141ebdc92aa02629ac2e1648d74a64e731af6f70dcac39de4d3fb",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
@@ -459,60 +479,202 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fca3c2",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5c3e",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xbc6be64dceb4f8092c52ebaabb2e11e76ac0224190010fb1c1be4a5d9accfd83",
+                    "mixHash" : "0x096f7f5e07a767eb702a717daa8a4321b70b7fcd924fb0c67a8e041340ba8db7",
+                    "nonce" : "0x703a297d34fa6777",
+                    "number" : "0x01",
+                    "parentHash" : "0xe1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0xf41f050b58cb3c1763ffbad422c3b66e18b3818e3efd274126bf6abdc5de0fac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f41f050b58cb3c1763ffbad422c3b66e18b3818e3efd274126bf6abdc5de0faca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0096f7f5e07a767eb702a717daa8a4321b70b7fcd924fb0c67a8e041340ba8db788703a297d34fa6777f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "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" : "0xbc6be64dceb4f8092c52ebaabb2e11e76ac0224190010fb1c1be4a5d9accfd83",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE_d0g0v0.json
index 4fc54b895..a18f64cd6 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcodecallcode_111_OOGE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "ac69c698635cf506a66ef739f0522efe4ae551d9e13bb757ebbceb02355b31be",
-                    "mixHash" : "bef38e118360317ccc99d1168741384f8332594eb0665a52e8e212003ecf0f65",
-                    "nonce" : "cdfab2d409eac9a4",
+                    "hash" : "0x75ba508e8d8f737d802ce8ac8b7607fe6811a38526ede74947860385738212a9",
+                    "mixHash" : "0xf17f0dabd8bfa3d5547b88347426c43abf846074b6bf2f462220b049c29699c3",
+                    "nonce" : "0xa6657e96c25bc378",
                     "number" : "0x01",
-                    "parentHash" : "356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
-                    "receiptTrie" : "bd7c3446d853fa5c762865a0aa49e5c910a568be2c9be5cf8d8d1c70a7028f82",
-                    "stateRoot" : "e20af6c2aa8af8a9df4fcb9176e1fc2eaef541e81ed6caed61185c10e0074753",
+                    "parentHash" : "0x356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
+                    "receiptTrie" : "0xbd7c3446d853fa5c762865a0aa49e5c910a568be2c9be5cf8d8d1c70a7028f82",
+                    "stateRoot" : "0xe20af6c2aa8af8a9df4fcb9176e1fc2eaef541e81ed6caed61185c10e0074753",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e20af6c2aa8af8a9df4fcb9176e1fc2eaef541e81ed6caed61185c10e0074753a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0bd7c3446d853fa5c762865a0aa49e5c910a568be2c9be5cf8d8d1c70a7028f82b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0bef38e118360317ccc99d1168741384f8332594eb0665a52e8e212003ecf0f6588cdfab2d409eac9a4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e20af6c2aa8af8a9df4fcb9176e1fc2eaef541e81ed6caed61185c10e0074753a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0bd7c3446d853fa5c762865a0aa49e5c910a568be2c9be5cf8d8d1c70a7028f82b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0f17f0dabd8bfa3d5547b88347426c43abf846074b6bf2f462220b049c29699c388a6657e96c25bc378f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ad12e52290d253c8536794b476a66d089e16adeb422411f02dc0b9d7adb7ca1b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xad12e52290d253c8536794b476a66d089e16adeb422411f02dc0b9d7adb7ca1b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad12e52290d253c8536794b476a66d089e16adeb422411f02dc0b9d7adb7ca1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ac69c698635cf506a66ef739f0522efe4ae551d9e13bb757ebbceb02355b31be",
+        "lastblockhash" : "0x75ba508e8d8f737d802ce8ac8b7607fe6811a38526ede74947860385738212a9",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -69,74 +74,74 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55892",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762a76e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -144,36 +149,41 @@
         }
     },
     "callcodecallcodecallcode_111_OOGE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "fd0718c8cb021088397801e986f39173abd103083cb2f1bde147da6efbfacd09",
-                    "mixHash" : "21f9649f71336fbd59196ae2496cd1836caff69a2f0b627c3aa1fba66f66df7d",
-                    "nonce" : "7459634bdf39c540",
+                    "hash" : "0x073b8a42f1767338434b9ba4bb65f14993488b2715042127c92272e5ed465013",
+                    "mixHash" : "0xbc70f188a3bd8c2f1a1d13d3c54cbd0d399f63469be1f4e2edcfdfdc7ae96a95",
+                    "nonce" : "0xaee6985e5fbc07d8",
                     "number" : "0x01",
-                    "parentHash" : "356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
-                    "receiptTrie" : "bd7c3446d853fa5c762865a0aa49e5c910a568be2c9be5cf8d8d1c70a7028f82",
-                    "stateRoot" : "e20af6c2aa8af8a9df4fcb9176e1fc2eaef541e81ed6caed61185c10e0074753",
+                    "parentHash" : "0x356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
+                    "receiptTrie" : "0xbd7c3446d853fa5c762865a0aa49e5c910a568be2c9be5cf8d8d1c70a7028f82",
+                    "stateRoot" : "0xe20af6c2aa8af8a9df4fcb9176e1fc2eaef541e81ed6caed61185c10e0074753",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e20af6c2aa8af8a9df4fcb9176e1fc2eaef541e81ed6caed61185c10e0074753a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0bd7c3446d853fa5c762865a0aa49e5c910a568be2c9be5cf8d8d1c70a7028f82b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a021f9649f71336fbd59196ae2496cd1836caff69a2f0b627c3aa1fba66f66df7d887459634bdf39c540f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e20af6c2aa8af8a9df4fcb9176e1fc2eaef541e81ed6caed61185c10e0074753a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0bd7c3446d853fa5c762865a0aa49e5c910a568be2c9be5cf8d8d1c70a7028f82b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0bc70f188a3bd8c2f1a1d13d3c54cbd0d399f63469be1f4e2edcfdfdc7ae96a9588aee6985e5fbc07d8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -183,28 +193,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ad12e52290d253c8536794b476a66d089e16adeb422411f02dc0b9d7adb7ca1b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xad12e52290d253c8536794b476a66d089e16adeb422411f02dc0b9d7adb7ca1b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad12e52290d253c8536794b476a66d089e16adeb422411f02dc0b9d7adb7ca1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "fd0718c8cb021088397801e986f39173abd103083cb2f1bde147da6efbfacd09",
+        "lastblockhash" : "0x073b8a42f1767338434b9ba4bb65f14993488b2715042127c92272e5ed465013",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -213,74 +223,74 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55892",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762a76e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -288,36 +298,41 @@
         }
     },
     "callcodecallcodecallcode_111_OOGE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "c1e4deb0ef40ce702e470436a3ffb87a064f782dcdc77247262e97cc628de550",
-                    "mixHash" : "47ba8553b6e8971fdf8cb26a85168991458345f437aa6e438062c9cfbfc04f40",
-                    "nonce" : "0aca340c98c46ade",
+                    "hash" : "0x481436575a73ff7e8cfcd4d587fd5af30e50386560776f6a15e5be4b553c5272",
+                    "mixHash" : "0x8b5cc3e16af453c3980a8608eecfbf74cb651ffafe599808a5cff8baf31252a2",
+                    "nonce" : "0x13f1da91cb5cecf1",
                     "number" : "0x01",
-                    "parentHash" : "356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
-                    "receiptTrie" : "f919565c7e5ecc29e1cc0f684d11b58e38c31919e892ce6dcf49a4400c9ec9a2",
-                    "stateRoot" : "aa969a5a5e6e117485a1a2dbc14e84e2387dbf471584e34cc4cb553f66527d01",
+                    "parentHash" : "0x356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
+                    "receiptTrie" : "0xf919565c7e5ecc29e1cc0f684d11b58e38c31919e892ce6dcf49a4400c9ec9a2",
+                    "stateRoot" : "0xaa969a5a5e6e117485a1a2dbc14e84e2387dbf471584e34cc4cb553f66527d01",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa969a5a5e6e117485a1a2dbc14e84e2387dbf471584e34cc4cb553f66527d01a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f919565c7e5ecc29e1cc0f684d11b58e38c31919e892ce6dcf49a4400c9ec9a2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a047ba8553b6e8971fdf8cb26a85168991458345f437aa6e438062c9cfbfc04f40880aca340c98c46adef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa969a5a5e6e117485a1a2dbc14e84e2387dbf471584e34cc4cb553f66527d01a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f919565c7e5ecc29e1cc0f684d11b58e38c31919e892ce6dcf49a4400c9ec9a2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a08b5cc3e16af453c3980a8608eecfbf74cb651ffafe599808a5cff8baf31252a28813f1da91cb5cecf1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -327,28 +342,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ad12e52290d253c8536794b476a66d089e16adeb422411f02dc0b9d7adb7ca1b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xad12e52290d253c8536794b476a66d089e16adeb422411f02dc0b9d7adb7ca1b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad12e52290d253c8536794b476a66d089e16adeb422411f02dc0b9d7adb7ca1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c1e4deb0ef40ce702e470436a3ffb87a064f782dcdc77247262e97cc628de550",
+        "lastblockhash" : "0x481436575a73ff7e8cfcd4d587fd5af30e50386560776f6a15e5be4b553c5272",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -357,74 +372,74 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550d6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af2a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -432,36 +447,41 @@
         }
     },
     "callcodecallcodecallcode_111_OOGE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_OOGE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "fc1f5431d0df06c71aed344e17f83c740bb451ea678a854d2e8e850d8050fabd",
-                    "mixHash" : "7ebd2419e473c2ee6c48cc61d9fcb6eee2758de1990d4fc21441845654e3e575",
-                    "nonce" : "70b6b16a6de0b6b4",
+                    "hash" : "0xee12d818b0eacfd952093b63689ad46a4176b39d8d6838152a7a0a928dcd72f0",
+                    "mixHash" : "0xed97cd2786aafe93aac901e5e9382b20feaf9229d72fd3e0d7a5cd28ec3be770",
+                    "nonce" : "0xef8adb4a0b5635a7",
                     "number" : "0x01",
-                    "parentHash" : "356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
-                    "receiptTrie" : "f919565c7e5ecc29e1cc0f684d11b58e38c31919e892ce6dcf49a4400c9ec9a2",
-                    "stateRoot" : "aa969a5a5e6e117485a1a2dbc14e84e2387dbf471584e34cc4cb553f66527d01",
+                    "parentHash" : "0x356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
+                    "receiptTrie" : "0xf919565c7e5ecc29e1cc0f684d11b58e38c31919e892ce6dcf49a4400c9ec9a2",
+                    "stateRoot" : "0xaa969a5a5e6e117485a1a2dbc14e84e2387dbf471584e34cc4cb553f66527d01",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa969a5a5e6e117485a1a2dbc14e84e2387dbf471584e34cc4cb553f66527d01a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f919565c7e5ecc29e1cc0f684d11b58e38c31919e892ce6dcf49a4400c9ec9a2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a07ebd2419e473c2ee6c48cc61d9fcb6eee2758de1990d4fc21441845654e3e5758870b6b16a6de0b6b4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa969a5a5e6e117485a1a2dbc14e84e2387dbf471584e34cc4cb553f66527d01a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f919565c7e5ecc29e1cc0f684d11b58e38c31919e892ce6dcf49a4400c9ec9a2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0ed97cd2786aafe93aac901e5e9382b20feaf9229d72fd3e0d7a5cd28ec3be77088ef8adb4a0b5635a7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -471,28 +491,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ad12e52290d253c8536794b476a66d089e16adeb422411f02dc0b9d7adb7ca1b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xad12e52290d253c8536794b476a66d089e16adeb422411f02dc0b9d7adb7ca1b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad12e52290d253c8536794b476a66d089e16adeb422411f02dc0b9d7adb7ca1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "fc1f5431d0df06c71aed344e17f83c740bb451ea678a854d2e8e850d8050fabd",
+        "lastblockhash" : "0xee12d818b0eacfd952093b63689ad46a4176b39d8d6838152a7a0a928dcd72f0",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -501,74 +521,230 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550d6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af2a",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xc4ddd1f8dac07b269b661c998d48e1b95ba7df7750a524d12d6faf441d1d8888",
+                    "mixHash" : "0x084bf06df0fcfcdaf776de46c5d06083dee340a31499a331c169fe06d1d246b5",
+                    "nonce" : "0x230d1aa5289d6023",
+                    "number" : "0x01",
+                    "parentHash" : "0x356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0xd3befae8c66a2035afdc0a44bf274edf7e352929c0498802c9c14fee636c7b89",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d3befae8c66a2035afdc0a44bf274edf7e352929c0498802c9c14fee636c7b89a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0084bf06df0fcfcdaf776de46c5d06083dee340a31499a331c169fe06d1d246b588230d1aa5289d6023f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0xc4ddd1f8dac07b269b661c998d48e1b95ba7df7750a524d12d6faf441d1d8888",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter_d0g0v0.json
index 42a026049..b93becece 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcodecallcode_111_OOGMAfter_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "58770ff1376dc537afc12b458a5567255d6349f20380aee4ede2fe0d851bd4d0",
-                    "mixHash" : "804608aae5ae2e295fb18810d7534fa2e63209249064dbae15b281f6937090cb",
-                    "nonce" : "2be97f9ccbcff4d7",
+                    "hash" : "0x9f14f4647ec3547cc2340a022c97f70b831e8d2f5758a1535b6432d53aa6c1ec",
+                    "mixHash" : "0x7a6b71b9ef5f2a4a46412173500c9e5e6bf4a0577a08f07385cd6c0c21ba52f9",
+                    "nonce" : "0xf37fa28fb2d16d56",
                     "number" : "0x01",
-                    "parentHash" : "b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
-                    "receiptTrie" : "85a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81",
-                    "stateRoot" : "b947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18",
+                    "parentHash" : "0xb1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
+                    "receiptTrie" : "0x85a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81",
+                    "stateRoot" : "0xb947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea085a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0804608aae5ae2e295fb18810d7534fa2e63209249064dbae15b281f6937090cb882be97f9ccbcff4d7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea085a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a07a6b71b9ef5f2a4a46412173500c9e5e6bf4a0577a08f07385cd6c0c21ba52f988f37fa28fb2d16d56f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "58770ff1376dc537afc12b458a5567255d6349f20380aee4ede2fe0d851bd4d0",
+        "lastblockhash" : "0x9f14f4647ec3547cc2340a022c97f70b831e8d2f5758a1535b6432d53aa6c1ec",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcodecallcodecallcode_111_OOGMAfter_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "2a6afbc97cbfad0fbfd46bd497d0a15bf3340e1fd750eb996d121854fbd1b794",
-                    "mixHash" : "39bea63b0a9990027a8330f39b8041726006080a25d85e17f4f99dd43377208b",
-                    "nonce" : "517a030f653598e3",
+                    "hash" : "0x982bdf50831ff32f693b3e39b02af162f1e5deb6c08c8919171b3fd0567471d6",
+                    "mixHash" : "0xf00576cb3a4fa335091b1e86424494ac738dac802d0207c646e9378aa148ed81",
+                    "nonce" : "0x5f52857dcdb812ec",
                     "number" : "0x01",
-                    "parentHash" : "b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
-                    "receiptTrie" : "85a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81",
-                    "stateRoot" : "b947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18",
+                    "parentHash" : "0xb1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
+                    "receiptTrie" : "0x85a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81",
+                    "stateRoot" : "0xb947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea085a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a039bea63b0a9990027a8330f39b8041726006080a25d85e17f4f99dd43377208b88517a030f653598e3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea085a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0f00576cb3a4fa335091b1e86424494ac738dac802d0207c646e9378aa148ed81885f52857dcdb812ecf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2a6afbc97cbfad0fbfd46bd497d0a15bf3340e1fd750eb996d121854fbd1b794",
+        "lastblockhash" : "0x982bdf50831ff32f693b3e39b02af162f1e5deb6c08c8919171b3fd0567471d6",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcodecallcodecallcode_111_OOGMAfter_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "667a10bcd07050b24cd69eebf4ee6bcd11e9963caa3caf4b8ae9e86b68cf5fbf",
-                    "mixHash" : "c4140a34e8895304c56218c1e20e414f289f9d1d9828a8b0f10afb4a2f3540f9",
-                    "nonce" : "0e7d2ae2bb040973",
+                    "hash" : "0xf1367a265338e10afe09d05e79fe73b4dd22fe63a0009bde5b853240c4f03f12",
+                    "mixHash" : "0xc13d5bcfb9d483d5734394885a633c25e5fbe923c2df05930ec2e70440d7f419",
+                    "nonce" : "0x5869bbceea780563",
                     "number" : "0x01",
-                    "parentHash" : "b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
-                    "receiptTrie" : "6d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494",
-                    "stateRoot" : "bd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdf",
+                    "parentHash" : "0xb1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
+                    "receiptTrie" : "0x6d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494",
+                    "stateRoot" : "0xbd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdf",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0c4140a34e8895304c56218c1e20e414f289f9d1d9828a8b0f10afb4a2f3540f9880e7d2ae2bb040973f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0c13d5bcfb9d483d5734394885a633c25e5fbe923c2df05930ec2e70440d7f419885869bbceea780563f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "667a10bcd07050b24cd69eebf4ee6bcd11e9963caa3caf4b8ae9e86b68cf5fbf",
+        "lastblockhash" : "0xf1367a265338e10afe09d05e79fe73b4dd22fe63a0009bde5b853240c4f03f12",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcodecallcodecallcode_111_OOGMAfter_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "26658f39e262fda33cdd18f31b1c6ef66db0fdd23a45344d5d429ed38f0e76fd",
-                    "mixHash" : "e64d9f127f93b47054beeed3ce5afb79f946e3194ea1643e37d77f5f43a73807",
-                    "nonce" : "8a220fe62ac2d62e",
+                    "hash" : "0x4d580d02ae5b62f3780713b56230491fa7b796108f27998b0f3bf917a63326e6",
+                    "mixHash" : "0x793bb4c45b7c30df7da813ef0b08842ba3e6696c02316bd60cd53effeca4cb2a",
+                    "nonce" : "0xeb58c225d3b6e619",
                     "number" : "0x01",
-                    "parentHash" : "b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
-                    "receiptTrie" : "6d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494",
-                    "stateRoot" : "bd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdf",
+                    "parentHash" : "0xb1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
+                    "receiptTrie" : "0x6d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494",
+                    "stateRoot" : "0xbd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdf",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0e64d9f127f93b47054beeed3ce5afb79f946e3194ea1643e37d77f5f43a73807888a220fe62ac2d62ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0793bb4c45b7c30df7da813ef0b08842ba3e6696c02316bd60cd53effeca4cb2a88eb58c225d3b6e619f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "26658f39e262fda33cdd18f31b1c6ef66db0fdd23a45344d5d429ed38f0e76fd",
+        "lastblockhash" : "0x4d580d02ae5b62f3780713b56230491fa7b796108f27998b0f3bf917a63326e6",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xdd9e13c9cc0bdd1e3400087918d93772f4a867981bb0a9e07bfb7ce34023d7fd",
+                    "mixHash" : "0x0d18eecf8f9f8362fa972d1e65c34499062eed8101f6c674e28580b45415f469",
+                    "nonce" : "0xb2414e2c7842fb11",
+                    "number" : "0x01",
+                    "parentHash" : "0xb1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0xc237a72d38f6924efa0f08b7657956ff775f28c771eba6f9a842134029cd0931",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c237a72d38f6924efa0f08b7657956ff775f28c771eba6f9a842134029cd0931a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a00d18eecf8f9f8362fa972d1e65c34499062eed8101f6c674e28580b45415f46988b2414e2c7842fb11f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0xdd9e13c9cc0bdd1e3400087918d93772f4a867981bb0a9e07bfb7ce34023d7fd",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore_d0g0v0.json
index 5bd276828..051b4bc19 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcodecallcode_111_OOGMBefore_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "7ca3df67f7a123871f3856d77e83c9fb6b08b86cc3d27537491a397a6270f3b8",
-                    "mixHash" : "d449b7bf4e7ee8b3c2a9124239c2c1606164f90d7a2600d452bffc12b5269e16",
-                    "nonce" : "bf38ab8d0e33f907",
+                    "hash" : "0x58d5cfc727d5cd12ba2b2c93c4d8ac63f7d870c309d63c8fb738adcbdd42f61e",
+                    "mixHash" : "0x664a731f83b2a61eff8caf22a54fe86e38023f3c1f624fd9783fb9667b66575d",
+                    "nonce" : "0x1a4f831e1bab9e95",
                     "number" : "0x01",
-                    "parentHash" : "94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
-                    "receiptTrie" : "72239dc860420b7e923c2b971c45222ceee9324aeadf35a0aada8c59f0cb79d6",
-                    "stateRoot" : "c85c89719ce819512ce409d429bba07d4ab7bd2c5862bb26cabb9e7837c022e7",
+                    "parentHash" : "0x94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
+                    "receiptTrie" : "0x72239dc860420b7e923c2b971c45222ceee9324aeadf35a0aada8c59f0cb79d6",
+                    "stateRoot" : "0xc85c89719ce819512ce409d429bba07d4ab7bd2c5862bb26cabb9e7837c022e7",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a094823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c85c89719ce819512ce409d429bba07d4ab7bd2c5862bb26cabb9e7837c022e7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea072239dc860420b7e923c2b971c45222ceee9324aeadf35a0aada8c59f0cb79d6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0d449b7bf4e7ee8b3c2a9124239c2c1606164f90d7a2600d452bffc12b5269e1688bf38ab8d0e33f907f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a094823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c85c89719ce819512ce409d429bba07d4ab7bd2c5862bb26cabb9e7837c022e7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea072239dc860420b7e923c2b971c45222ceee9324aeadf35a0aada8c59f0cb79d6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0664a731f83b2a61eff8caf22a54fe86e38023f3c1f624fd9783fb9667b66575d881a4f831e1bab9e95f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "df688ab368def569e028da42c4b092425859d3774bcb7ac4c7d8572dceeefebe",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdf688ab368def569e028da42c4b092425859d3774bcb7ac4c7d8572dceeefebe",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df688ab368def569e028da42c4b092425859d3774bcb7ac4c7d8572dceeefebea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7ca3df67f7a123871f3856d77e83c9fb6b08b86cc3d27537491a397a6270f3b8",
+        "lastblockhash" : "0x58d5cfc727d5cd12ba2b2c93c4d8ac63f7d870c309d63c8fb738adcbdd42f61e",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa0c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcodecallcodecallcode_111_OOGMBefore_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "e147a820f5f3e45c3c8e21ca7836a09478865524365d513ef7857747bf58cf7d",
-                    "mixHash" : "f2e1059a2628ee04a096f2bf158e3b2034ed132aae744af15dbf472d81cd0b55",
-                    "nonce" : "ff1a20cbc58f3501",
+                    "hash" : "0x634ae0cf08aab0cc2e30244beb38feadd0d3c40eff8a6c7c9870d08904b4efca",
+                    "mixHash" : "0xd3fa117ad90452390c6088df26dd3d1d83329eada40a61ef049f39898ba1befd",
+                    "nonce" : "0xec516d43fe49d477",
                     "number" : "0x01",
-                    "parentHash" : "94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
-                    "receiptTrie" : "72239dc860420b7e923c2b971c45222ceee9324aeadf35a0aada8c59f0cb79d6",
-                    "stateRoot" : "c85c89719ce819512ce409d429bba07d4ab7bd2c5862bb26cabb9e7837c022e7",
+                    "parentHash" : "0x94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
+                    "receiptTrie" : "0x72239dc860420b7e923c2b971c45222ceee9324aeadf35a0aada8c59f0cb79d6",
+                    "stateRoot" : "0xc85c89719ce819512ce409d429bba07d4ab7bd2c5862bb26cabb9e7837c022e7",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a094823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c85c89719ce819512ce409d429bba07d4ab7bd2c5862bb26cabb9e7837c022e7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea072239dc860420b7e923c2b971c45222ceee9324aeadf35a0aada8c59f0cb79d6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0f2e1059a2628ee04a096f2bf158e3b2034ed132aae744af15dbf472d81cd0b5588ff1a20cbc58f3501f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a094823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c85c89719ce819512ce409d429bba07d4ab7bd2c5862bb26cabb9e7837c022e7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea072239dc860420b7e923c2b971c45222ceee9324aeadf35a0aada8c59f0cb79d6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0d3fa117ad90452390c6088df26dd3d1d83329eada40a61ef049f39898ba1befd88ec516d43fe49d477f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "df688ab368def569e028da42c4b092425859d3774bcb7ac4c7d8572dceeefebe",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdf688ab368def569e028da42c4b092425859d3774bcb7ac4c7d8572dceeefebe",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df688ab368def569e028da42c4b092425859d3774bcb7ac4c7d8572dceeefebea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e147a820f5f3e45c3c8e21ca7836a09478865524365d513ef7857747bf58cf7d",
+        "lastblockhash" : "0x634ae0cf08aab0cc2e30244beb38feadd0d3c40eff8a6c7c9870d08904b4efca",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa0c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcodecallcodecallcode_111_OOGMBefore_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "2bfcdd4d708e6a0f393b9286de7869800896e22cb0fa07dfb40f0e15b86deb3d",
-                    "mixHash" : "08f322191d7f50299a6ddaa477571721c54991d63d9af3ce7763066d6b3895b7",
-                    "nonce" : "f2341f145ba7c373",
+                    "hash" : "0xdbef4a5e320b5ac88d120315a7f7d0360a74368698be415fee4ccb9b323b675f",
+                    "mixHash" : "0x89871c1cfb6fbbe887b60050dc697b57b62cccf7a5a4c7f7f9fce3368f29da29",
+                    "nonce" : "0x4b337cb7a1d4d150",
                     "number" : "0x01",
-                    "parentHash" : "94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
-                    "receiptTrie" : "571f25fc91261846c7ae8c20f28840d019c004e8ac0ccb49ba84b27442baf986",
-                    "stateRoot" : "44dda085e724a1930ee72141687fe0cc434a5f73abcee10806f849788c0e34d6",
+                    "parentHash" : "0x94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
+                    "receiptTrie" : "0x571f25fc91261846c7ae8c20f28840d019c004e8ac0ccb49ba84b27442baf986",
+                    "stateRoot" : "0x44dda085e724a1930ee72141687fe0cc434a5f73abcee10806f849788c0e34d6",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a094823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044dda085e724a1930ee72141687fe0cc434a5f73abcee10806f849788c0e34d6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0571f25fc91261846c7ae8c20f28840d019c004e8ac0ccb49ba84b27442baf986b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a008f322191d7f50299a6ddaa477571721c54991d63d9af3ce7763066d6b3895b788f2341f145ba7c373f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a094823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044dda085e724a1930ee72141687fe0cc434a5f73abcee10806f849788c0e34d6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0571f25fc91261846c7ae8c20f28840d019c004e8ac0ccb49ba84b27442baf986b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a089871c1cfb6fbbe887b60050dc697b57b62cccf7a5a4c7f7f9fce3368f29da29884b337cb7a1d4d150f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,28 +340,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "df688ab368def569e028da42c4b092425859d3774bcb7ac4c7d8572dceeefebe",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdf688ab368def569e028da42c4b092425859d3774bcb7ac4c7d8572dceeefebe",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df688ab368def569e028da42c4b092425859d3774bcb7ac4c7d8572dceeefebea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2bfcdd4d708e6a0f393b9286de7869800896e22cb0fa07dfb40f0e15b86deb3d",
+        "lastblockhash" : "0xdbef4a5e320b5ac88d120315a7f7d0360a74368698be415fee4ccb9b323b675f",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -354,74 +369,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -429,36 +444,41 @@
         }
     },
     "callcodecallcodecallcode_111_OOGMBefore_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_OOGMBefore_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "4a46e1c6b034e961d5e90ec0c97081b9f90db4dd8d7b769be582a136d4f59d1f",
-                    "mixHash" : "8cb9b46e052ba276a5c7ce3c506e5c45509962fec03c132cdeaae4eb76767237",
-                    "nonce" : "fa67f9a89f792466",
+                    "hash" : "0x26a907e80c36f72bd74aafaa41a38c81ce48f1981b3ee40858bc8c60447665aa",
+                    "mixHash" : "0x0b4f6fffcc877b74da5fde57f6de4a4dcb59e1be215658e764598c7049387fe8",
+                    "nonce" : "0xd8550c39b263d388",
                     "number" : "0x01",
-                    "parentHash" : "94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
-                    "receiptTrie" : "571f25fc91261846c7ae8c20f28840d019c004e8ac0ccb49ba84b27442baf986",
-                    "stateRoot" : "44dda085e724a1930ee72141687fe0cc434a5f73abcee10806f849788c0e34d6",
+                    "parentHash" : "0x94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
+                    "receiptTrie" : "0x571f25fc91261846c7ae8c20f28840d019c004e8ac0ccb49ba84b27442baf986",
+                    "stateRoot" : "0x44dda085e724a1930ee72141687fe0cc434a5f73abcee10806f849788c0e34d6",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a094823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044dda085e724a1930ee72141687fe0cc434a5f73abcee10806f849788c0e34d6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0571f25fc91261846c7ae8c20f28840d019c004e8ac0ccb49ba84b27442baf986b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a08cb9b46e052ba276a5c7ce3c506e5c45509962fec03c132cdeaae4eb7676723788fa67f9a89f792466f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a094823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044dda085e724a1930ee72141687fe0cc434a5f73abcee10806f849788c0e34d6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0571f25fc91261846c7ae8c20f28840d019c004e8ac0ccb49ba84b27442baf986b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a00b4f6fffcc877b74da5fde57f6de4a4dcb59e1be215658e764598c7049387fe888d8550c39b263d388f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -468,28 +488,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "df688ab368def569e028da42c4b092425859d3774bcb7ac4c7d8572dceeefebe",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdf688ab368def569e028da42c4b092425859d3774bcb7ac4c7d8572dceeefebe",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df688ab368def569e028da42c4b092425859d3774bcb7ac4c7d8572dceeefebea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4a46e1c6b034e961d5e90ec0c97081b9f90db4dd8d7b769be582a136d4f59d1f",
+        "lastblockhash" : "0x26a907e80c36f72bd74aafaa41a38c81ce48f1981b3ee40858bc8c60447665aa",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
@@ -497,74 +517,229 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x80c377aad09da11dfe14a5422beff6e0ef68d0fd6730ced8217b246155da878f",
+                    "mixHash" : "0xef54402be8601ac382fc905a6957854a667443d3e629d9a981010422419b4eba",
+                    "nonce" : "0xfd138bf30ef12294",
+                    "number" : "0x01",
+                    "parentHash" : "0x94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0xfec7cc3eeaa99659377fbbcbefde3b7edc11892257f9d90cf641e4be188e28e7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a094823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fec7cc3eeaa99659377fbbcbefde3b7edc11892257f9d90cf641e4be188e28e7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0ef54402be8601ac382fc905a6957854a667443d3e629d9a981010422419b4eba88fd138bf30ef12294f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "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" : "0x80c377aad09da11dfe14a5422beff6e0ef68d0fd6730ced8217b246155da878f",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd_d0g0v0.json
index b9ea8453f..0a3f4c313 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcodecallcode_111_SuicideEnd_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "adeeb9a10aa20b2506442da4c61158780143e2a984fa62324ebcb8a1f64de09d",
-                    "mixHash" : "4f736a5cec3ae9d33ab395c154fc8e12d16a2a651c734e34d22143fc1645f925",
-                    "nonce" : "ef70328ba0b3fa0b",
+                    "hash" : "0xbff0f39168d580c56e7dc53a2c7f32030137d18cc8c0ad5571982f7b45aaafe3",
+                    "mixHash" : "0x8a16073dce3ef70807cb04069752562178e6a4edd13d7279aa0964a74ae91166",
+                    "nonce" : "0x50823a3638f21582",
                     "number" : "0x01",
-                    "parentHash" : "8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
-                    "receiptTrie" : "4bd84c174204ca46701dc19bb709be4621e48fd2a9d039b137d4571622879df4",
-                    "stateRoot" : "a5cceb488948c261ee22bf210b8fb358e3323d64247d7ea2335e2c30900c5867",
+                    "parentHash" : "0x8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
+                    "receiptTrie" : "0x4bd84c174204ca46701dc19bb709be4621e48fd2a9d039b137d4571622879df4",
+                    "stateRoot" : "0xa5cceb488948c261ee22bf210b8fb358e3323d64247d7ea2335e2c30900c5867",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a5cceb488948c261ee22bf210b8fb358e3323d64247d7ea2335e2c30900c5867a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a04bd84c174204ca46701dc19bb709be4621e48fd2a9d039b137d4571622879df4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a04f736a5cec3ae9d33ab395c154fc8e12d16a2a651c734e34d22143fc1645f92588ef70328ba0b3fa0bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a08400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a5cceb488948c261ee22bf210b8fb358e3323d64247d7ea2335e2c30900c5867a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a04bd84c174204ca46701dc19bb709be4621e48fd2a9d039b137d4571622879df4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a08a16073dce3ef70807cb04069752562178e6a4edd13d7279aa0964a74ae911668850823a3638f21582f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,95 +44,95 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e3adedf1b5b14b6bc2d5dcb76cbf151cfe0e5f2b55539e48746b8c61979aa21f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe3adedf1b5b14b6bc2d5dcb76cbf151cfe0e5f2b55539e48746b8c61979aa21f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3adedf1b5b14b6bc2d5dcb76cbf151cfe0e5f2b55539e48746b8c61979aa21fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "adeeb9a10aa20b2506442da4c61158780143e2a984fa62324ebcb8a1f64de09d",
+        "lastblockhash" : "0xbff0f39168d580c56e7dc53a2c7f32030137d18cc8c0ad5571982f7b45aaafe3",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f548e7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762b719",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -135,36 +140,41 @@
         }
     },
     "callcodecallcodecallcode_111_SuicideEnd_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "f5f61f398b45d542ec3c335b006df47256a03ef13f22d55456c5066bbdbc0a24",
-                    "mixHash" : "1951a7b88f69755af06a03e4fc5416fe0507d0cf0fb3b0acba9711d1a277048f",
-                    "nonce" : "7947ba6cf6658f65",
+                    "hash" : "0xd0541cf143e7a186269da84031cd9d8e9d0a9f980effb187bcb0e23a080d937e",
+                    "mixHash" : "0x25aec3c22d5176022d3ff161205cb0f8fb25ba512196fdcce71ffbff1fdbdae9",
+                    "nonce" : "0xc1f12fe02e2a7e06",
                     "number" : "0x01",
-                    "parentHash" : "8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
-                    "receiptTrie" : "4bd84c174204ca46701dc19bb709be4621e48fd2a9d039b137d4571622879df4",
-                    "stateRoot" : "a5cceb488948c261ee22bf210b8fb358e3323d64247d7ea2335e2c30900c5867",
+                    "parentHash" : "0x8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
+                    "receiptTrie" : "0x4bd84c174204ca46701dc19bb709be4621e48fd2a9d039b137d4571622879df4",
+                    "stateRoot" : "0xa5cceb488948c261ee22bf210b8fb358e3323d64247d7ea2335e2c30900c5867",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a5cceb488948c261ee22bf210b8fb358e3323d64247d7ea2335e2c30900c5867a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a04bd84c174204ca46701dc19bb709be4621e48fd2a9d039b137d4571622879df4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a01951a7b88f69755af06a03e4fc5416fe0507d0cf0fb3b0acba9711d1a277048f887947ba6cf6658f65f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a08400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a5cceb488948c261ee22bf210b8fb358e3323d64247d7ea2335e2c30900c5867a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a04bd84c174204ca46701dc19bb709be4621e48fd2a9d039b137d4571622879df4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a025aec3c22d5176022d3ff161205cb0f8fb25ba512196fdcce71ffbff1fdbdae988c1f12fe02e2a7e06f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -174,95 +184,95 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e3adedf1b5b14b6bc2d5dcb76cbf151cfe0e5f2b55539e48746b8c61979aa21f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe3adedf1b5b14b6bc2d5dcb76cbf151cfe0e5f2b55539e48746b8c61979aa21f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3adedf1b5b14b6bc2d5dcb76cbf151cfe0e5f2b55539e48746b8c61979aa21fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f5f61f398b45d542ec3c335b006df47256a03ef13f22d55456c5066bbdbc0a24",
+        "lastblockhash" : "0xd0541cf143e7a186269da84031cd9d8e9d0a9f980effb187bcb0e23a080d937e",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f548e7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762b719",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -270,36 +280,41 @@
         }
     },
     "callcodecallcodecallcode_111_SuicideEnd_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "aee3e5a22a44a05c1fc51791fae447ded06f4b4b3140d201c6134c7244632bbf",
-                    "mixHash" : "952ccac4b42eda08de708d7ac42cb93d4069514fdbd5b13dcc9cad3c933f0956",
-                    "nonce" : "5da3eb8a75ca9f18",
+                    "hash" : "0xf8e2732cee93da700dd12cea10e08b5702890867750e63a26cc0e099b2cc54d5",
+                    "mixHash" : "0xd961eb60e053af3c510a4b7d1660a21ff6b08042e48e2fc6dc13be6d86748f78",
+                    "nonce" : "0x26c1b2ade17524c7",
                     "number" : "0x01",
-                    "parentHash" : "8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
-                    "receiptTrie" : "27152705d1b7cf668e98f87a6312dab87d385d36e6e15a44c29ca4a28b50db32",
-                    "stateRoot" : "a77f6de28ac35c9f1e0c5da8845d404456ee2cd812380b93abd5a4c59abbde77",
+                    "parentHash" : "0x8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
+                    "receiptTrie" : "0x27152705d1b7cf668e98f87a6312dab87d385d36e6e15a44c29ca4a28b50db32",
+                    "stateRoot" : "0xa77f6de28ac35c9f1e0c5da8845d404456ee2cd812380b93abd5a4c59abbde77",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a77f6de28ac35c9f1e0c5da8845d404456ee2cd812380b93abd5a4c59abbde77a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a027152705d1b7cf668e98f87a6312dab87d385d36e6e15a44c29ca4a28b50db32b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0952ccac4b42eda08de708d7ac42cb93d4069514fdbd5b13dcc9cad3c933f0956885da3eb8a75ca9f18f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a08400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a77f6de28ac35c9f1e0c5da8845d404456ee2cd812380b93abd5a4c59abbde77a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a027152705d1b7cf668e98f87a6312dab87d385d36e6e15a44c29ca4a28b50db32b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0d961eb60e053af3c510a4b7d1660a21ff6b08042e48e2fc6dc13be6d86748f788826c1b2ade17524c7f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -309,95 +324,95 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e3adedf1b5b14b6bc2d5dcb76cbf151cfe0e5f2b55539e48746b8c61979aa21f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe3adedf1b5b14b6bc2d5dcb76cbf151cfe0e5f2b55539e48746b8c61979aa21f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3adedf1b5b14b6bc2d5dcb76cbf151cfe0e5f2b55539e48746b8c61979aa21fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "aee3e5a22a44a05c1fc51791fae447ded06f4b4b3140d201c6134c7244632bbf",
+        "lastblockhash" : "0xf8e2732cee93da700dd12cea10e08b5702890867750e63a26cc0e099b2cc54d5",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52da3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762d25d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -405,36 +420,41 @@
         }
     },
     "callcodecallcodecallcode_111_SuicideEnd_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_SuicideEnd_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "f655f0069d39829672e07031e248547ce273d064ea46be4272cda788b800c7bc",
-                    "mixHash" : "5f56ee31b7d3de157ed30e28ae1a69c8f8d0bc170f8b13c10f14fa0ac7854a3b",
-                    "nonce" : "1174460e35221e79",
+                    "hash" : "0xdb9fab3e2e8ee3f7351ef512b497e3cd531b5f70462563a7d06f35e9454f5495",
+                    "mixHash" : "0x163c6185e43bd1b303aa38ccd8fdd2db14ebc6bb0d0f0cf82a73b85c69dd675d",
+                    "nonce" : "0xe5e58d242da6fe13",
                     "number" : "0x01",
-                    "parentHash" : "8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
-                    "receiptTrie" : "27152705d1b7cf668e98f87a6312dab87d385d36e6e15a44c29ca4a28b50db32",
-                    "stateRoot" : "a77f6de28ac35c9f1e0c5da8845d404456ee2cd812380b93abd5a4c59abbde77",
+                    "parentHash" : "0x8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
+                    "receiptTrie" : "0x27152705d1b7cf668e98f87a6312dab87d385d36e6e15a44c29ca4a28b50db32",
+                    "stateRoot" : "0xa77f6de28ac35c9f1e0c5da8845d404456ee2cd812380b93abd5a4c59abbde77",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a77f6de28ac35c9f1e0c5da8845d404456ee2cd812380b93abd5a4c59abbde77a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a027152705d1b7cf668e98f87a6312dab87d385d36e6e15a44c29ca4a28b50db32b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a05f56ee31b7d3de157ed30e28ae1a69c8f8d0bc170f8b13c10f14fa0ac7854a3b881174460e35221e79f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a08400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a77f6de28ac35c9f1e0c5da8845d404456ee2cd812380b93abd5a4c59abbde77a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a027152705d1b7cf668e98f87a6312dab87d385d36e6e15a44c29ca4a28b50db32b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0163c6185e43bd1b303aa38ccd8fdd2db14ebc6bb0d0f0cf82a73b85c69dd675d88e5e58d242da6fe13f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -444,95 +464,242 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e3adedf1b5b14b6bc2d5dcb76cbf151cfe0e5f2b55539e48746b8c61979aa21f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe3adedf1b5b14b6bc2d5dcb76cbf151cfe0e5f2b55539e48746b8c61979aa21f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3adedf1b5b14b6bc2d5dcb76cbf151cfe0e5f2b55539e48746b8c61979aa21fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f655f0069d39829672e07031e248547ce273d064ea46be4272cda788b800c7bc",
+        "lastblockhash" : "0xdb9fab3e2e8ee3f7351ef512b497e3cd531b5f70462563a7d06f35e9454f5495",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52da3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762d25d",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x3eec0d47edf812096f7a74831a4ecd2d85ec8345e5c7fcd1aa26a7961a43edb4",
+                    "mixHash" : "0x6d2372955d658ea8fab44181016ccf2dd8c037206ebcf29eca62b9dbe0f07259",
+                    "nonce" : "0xd2c22fcfe9fe6f49",
+                    "number" : "0x01",
+                    "parentHash" : "0x8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0xc54286436eff51410535ce3004b0fbf65ee6c16b9e46e290c8c3c12f866bc967",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a08400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c54286436eff51410535ce3004b0fbf65ee6c16b9e46e290c8c3c12f866bc967a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a06d2372955d658ea8fab44181016ccf2dd8c037206ebcf29eca62b9dbe0f0725988d2c22fcfe9fe6f49f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x3eec0d47edf812096f7a74831a4ecd2d85ec8345e5c7fcd1aa26a7961a43edb4",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle.json
deleted file mode 100644
index 7a43b8a41..000000000
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle.json
+++ /dev/null
@@ -1,542 +0,0 @@
-{
-    "callcodecallcodecallcode_111_SuicideMiddle_d0g0v0_EIP150" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c7",
-                    "hash" : "0541aaa158108948ac87136caaad9f1e122aa253c634a5a00f12627ce748c6fe",
-                    "mixHash" : "f93361eb6c77d1e6b330390152581b1acf1b40fef1b3cbe192cda6f8bade8608",
-                    "nonce" : "3947eac0c2fadd64",
-                    "number" : "0x01",
-                    "parentHash" : "4cc01854f3b60545e4f091ec09c28262a4fb08e939927b3a83acd7594e7df32e",
-                    "receiptTrie" : "63de206f04d457e6f4b31aa7f0fac5664805a790693843c9630e0835f2dfea7f",
-                    "stateRoot" : "8c6c129007eaa78e6cc7bfecebcfb06b92af9007c142ebaa8eb8e8226f502f94",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a04cc01854f3b60545e4f091ec09c28262a4fb08e939927b3a83acd7594e7df32ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c6c129007eaa78e6cc7bfecebcfb06b92af9007c142ebaa8eb8e8226f502f94a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a063de206f04d457e6f4b31aa7f0fac5664805a790693843c9630e0835f2dfea7fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0f93361eb6c77d1e6b330390152581b1acf1b40fef1b3cbe192cda6f8bade8608883947eac0c2fadd64f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "4cc01854f3b60545e4f091ec09c28262a4fb08e939927b3a83acd7594e7df32e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0b2f61d18a023b40bee3b302bbd94879f0db348ddd8fe6b3d17558174828e621",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b2f61d18a023b40bee3b302bbd94879f0db348ddd8fe6b3d17558174828e621a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0541aaa158108948ac87136caaad9f1e122aa253c634a5a00f12627ce748c6fe",
-        "network" : "EIP150",
-        "postState" : {
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635639",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcodecallcode_111_SuicideMiddle_d0g0v0_EIP158" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c7",
-                    "hash" : "e4d555165c4cc0add6b79aa2a1dffed558bc6aeeec97e9a355a0f3483dab63e0",
-                    "mixHash" : "1245d8b859c573fbd7d5a1a3900ebef71facccf4090923ff7be06980b45005ba",
-                    "nonce" : "dbc32d1aafbe0aae",
-                    "number" : "0x01",
-                    "parentHash" : "4cc01854f3b60545e4f091ec09c28262a4fb08e939927b3a83acd7594e7df32e",
-                    "receiptTrie" : "63de206f04d457e6f4b31aa7f0fac5664805a790693843c9630e0835f2dfea7f",
-                    "stateRoot" : "8c6c129007eaa78e6cc7bfecebcfb06b92af9007c142ebaa8eb8e8226f502f94",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a04cc01854f3b60545e4f091ec09c28262a4fb08e939927b3a83acd7594e7df32ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c6c129007eaa78e6cc7bfecebcfb06b92af9007c142ebaa8eb8e8226f502f94a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a063de206f04d457e6f4b31aa7f0fac5664805a790693843c9630e0835f2dfea7fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a01245d8b859c573fbd7d5a1a3900ebef71facccf4090923ff7be06980b45005ba88dbc32d1aafbe0aaef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "4cc01854f3b60545e4f091ec09c28262a4fb08e939927b3a83acd7594e7df32e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0b2f61d18a023b40bee3b302bbd94879f0db348ddd8fe6b3d17558174828e621",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b2f61d18a023b40bee3b302bbd94879f0db348ddd8fe6b3d17558174828e621a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e4d555165c4cc0add6b79aa2a1dffed558bc6aeeec97e9a355a0f3483dab63e0",
-        "network" : "EIP158",
-        "postState" : {
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635639",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcodecallcode_111_SuicideMiddle_d0g0v0_Frontier" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9117",
-                    "hash" : "156a3ab02d76bda595f145cc3183ec83134e0df5c7ad9e74721e43cc8c5342b9",
-                    "mixHash" : "33c698f80b25cc5adf3991d013c109d6bc15540febc11aa8d31f56ca30384eec",
-                    "nonce" : "5cba2134ea7df793",
-                    "number" : "0x01",
-                    "parentHash" : "4cc01854f3b60545e4f091ec09c28262a4fb08e939927b3a83acd7594e7df32e",
-                    "receiptTrie" : "979cc53b034d29bbd95604be308bde529c1493c0563e724e27c081bbbba5d302",
-                    "stateRoot" : "dd17c3f40c85819dad08a870b1141b1796bc11c5ecb7fb8401b41c8906df2f2c",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a04cc01854f3b60545e4f091ec09c28262a4fb08e939927b3a83acd7594e7df32ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd17c3f40c85819dad08a870b1141b1796bc11c5ecb7fb8401b41c8906df2f2ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0979cc53b034d29bbd95604be308bde529c1493c0563e724e27c081bbbba5d302b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a033c698f80b25cc5adf3991d013c109d6bc15540febc11aa8d31f56ca30384eec885cba2134ea7df793f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "4cc01854f3b60545e4f091ec09c28262a4fb08e939927b3a83acd7594e7df32e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0b2f61d18a023b40bee3b302bbd94879f0db348ddd8fe6b3d17558174828e621",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b2f61d18a023b40bee3b302bbd94879f0db348ddd8fe6b3d17558174828e621a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "156a3ab02d76bda595f145cc3183ec83134e0df5c7ad9e74721e43cc8c5342b9",
-        "network" : "Frontier",
-        "postState" : {
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49117",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636ee9",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcodecallcode_111_SuicideMiddle_d0g0v0_Homestead" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9117",
-                    "hash" : "eca5f1710419d83d13b3b3730af4bdaaf18d068e80f9ec15244b4d02d4a79e5b",
-                    "mixHash" : "154f83b46269c44c07a7ba4f529fa922b06a0c5d18e6e5ed77037091d5589ec2",
-                    "nonce" : "46e7afbf86b8f72e",
-                    "number" : "0x01",
-                    "parentHash" : "4cc01854f3b60545e4f091ec09c28262a4fb08e939927b3a83acd7594e7df32e",
-                    "receiptTrie" : "979cc53b034d29bbd95604be308bde529c1493c0563e724e27c081bbbba5d302",
-                    "stateRoot" : "dd17c3f40c85819dad08a870b1141b1796bc11c5ecb7fb8401b41c8906df2f2c",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a04cc01854f3b60545e4f091ec09c28262a4fb08e939927b3a83acd7594e7df32ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd17c3f40c85819dad08a870b1141b1796bc11c5ecb7fb8401b41c8906df2f2ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0979cc53b034d29bbd95604be308bde529c1493c0563e724e27c081bbbba5d302b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0154f83b46269c44c07a7ba4f529fa922b06a0c5d18e6e5ed77037091d5589ec28846e7afbf86b8f72ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "4cc01854f3b60545e4f091ec09c28262a4fb08e939927b3a83acd7594e7df32e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0b2f61d18a023b40bee3b302bbd94879f0db348ddd8fe6b3d17558174828e621",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b2f61d18a023b40bee3b302bbd94879f0db348ddd8fe6b3d17558174828e621a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "eca5f1710419d83d13b3b3730af4bdaaf18d068e80f9ec15244b4d02d4a79e5b",
-        "network" : "Homestead",
-        "postState" : {
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49117",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636ee9",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0.json
new file mode 100644
index 000000000..aaf23caa2
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0.json
@@ -0,0 +1,709 @@
+{
+    "callcodecallcodecallcode_111_SuicideMiddle_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x8d5c72a4ac2f5d969ede7dd94117ffbc58ca56f83e5b3be401f86bbce6571d0a",
+                    "mixHash" : "0x869dcc71b794f500b86908c0dd78d2cdd7dc61d84b64ee6e12179401c394bfa8",
+                    "nonce" : "0x3291be8ef87ba572",
+                    "number" : "0x01",
+                    "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+                    "receiptTrie" : "0xf314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449",
+                    "stateRoot" : "0x6160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dca",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dcaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0869dcc71b794f500b86908c0dd78d2cdd7dc61d84b64ee6e12179401c394bfa8883291be8ef87ba572f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x8d5c72a4ac2f5d969ede7dd94117ffbc58ca56f83e5b3be401f86bbce6571d0a",
+        "network" : "EIP150",
+        "postState" : {
+            "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_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x51113193e851cff739217703df37a26fb50369aa12b6d9cac03ebeb3dad5f513",
+                    "mixHash" : "0x5f337aa1cd0ff6828605d433a8fb92749a9419bb763e18bfa337f00200acfc5d",
+                    "nonce" : "0xd099417762994f97",
+                    "number" : "0x01",
+                    "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+                    "receiptTrie" : "0xf314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449",
+                    "stateRoot" : "0x6160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dca",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dcaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a05f337aa1cd0ff6828605d433a8fb92749a9419bb763e18bfa337f00200acfc5d88d099417762994f97f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x51113193e851cff739217703df37a26fb50369aa12b6d9cac03ebeb3dad5f513",
+        "network" : "EIP158",
+        "postState" : {
+            "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_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x9117",
+                    "hash" : "0xea4b681d591b5574e4285d44aa705138b1be70a033fafb586f6b776d41fe49a3",
+                    "mixHash" : "0x8315d240d4fd2bdfb0cee67543584ac661e297346006f9dd7a6e6ea6d3574c1e",
+                    "nonce" : "0x002bd0fc2151d8ff",
+                    "number" : "0x01",
+                    "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+                    "receiptTrie" : "0x9968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730",
+                    "stateRoot" : "0x440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a08315d240d4fd2bdfb0cee67543584ac661e297346006f9dd7a6e6ea6d3574c1e88002bd0fc2151d8fff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xea4b681d591b5574e4285d44aa705138b1be70a033fafb586f6b776d41fe49a3",
+        "network" : "Frontier",
+        "postState" : {
+            "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" : "0x4563918244f49117",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7636ee9",
+                "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_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x9117",
+                    "hash" : "0x88d2fd9ce40dea68346671a9bed534b771ffc1e44490004114837a3dbe3b3218",
+                    "mixHash" : "0xe963a0cb5fde072e1b9aaac68c8ac53798c4600a42c0107053c778d561327b10",
+                    "nonce" : "0x3c20ef900974c81e",
+                    "number" : "0x01",
+                    "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+                    "receiptTrie" : "0x9968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730",
+                    "stateRoot" : "0x440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0e963a0cb5fde072e1b9aaac68c8ac53798c4600a42c0107053c778d561327b10883c20ef900974c81ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x88d2fd9ce40dea68346671a9bed534b771ffc1e44490004114837a3dbe3b3218",
+        "network" : "Homestead",
+        "postState" : {
+            "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" : "0x4563918244f49117",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7636ee9",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0x7b69181b480d7cc978f33bcc19603cac929aa0193f05b5b9ea22c092ddf27ca9",
+                    "mixHash" : "0xf26e87f6d2cd2647fd4d0efd93ce1168d218e1befaca27fc41aba723ee061b16",
+                    "nonce" : "0x87d96b0e1f2062cb",
+                    "number" : "0x01",
+                    "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x4b16f02d8f4bd5f41f0c7e0c9117d41092c750a9f779c862b99ec2c557037cea",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b16f02d8f4bd5f41f0c7e0c9117d41092c750a9f779c862b99ec2c557037ceaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0f26e87f6d2cd2647fd4d0efd93ce1168d218e1befaca27fc41aba723ee061b168887d96b0e1f2062cbf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x7b69181b480d7cc978f33bcc19603cac929aa0193f05b5b9ea22c092ddf27ca9",
+        "network" : "Metropolis",
+        "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" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_d0g0v0.json
index 5e605d4e3..0a8c4c23e 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcodecallcode_111_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "672997cae483226dbc545bf5bea0a7a52f00959e881c80ed0d9d48ea229eb658",
-                    "mixHash" : "4ac8515361f4b5d52cd4162c19171fecaca8c49140e397cd1a871f317fa8d4b1",
-                    "nonce" : "497c9ba96c1e6e7f",
+                    "hash" : "0x9fcf528eec9cb6aaacf780bea6683708e81a730637f3b913fa4060c8ac1899d2",
+                    "mixHash" : "0xc9c9c67b1bb5ded943cae4b9c4a8c56fb136c1f1df9e5812ffb60e8498904032",
+                    "nonce" : "0xf3f0f0260f197caa",
                     "number" : "0x01",
-                    "parentHash" : "81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
-                    "receiptTrie" : "f3ec3f5da2a1e8e0b58252deb945accf7dd7c50cd34ff74a927f15f322ea8352",
-                    "stateRoot" : "e0bbe7bee0a1dfd3c46a3066aae3b76525ab8a93e71627281d1989f1e89d1150",
+                    "parentHash" : "0x81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
+                    "receiptTrie" : "0xf3ec3f5da2a1e8e0b58252deb945accf7dd7c50cd34ff74a927f15f322ea8352",
+                    "stateRoot" : "0xe0bbe7bee0a1dfd3c46a3066aae3b76525ab8a93e71627281d1989f1e89d1150",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a081fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e0bbe7bee0a1dfd3c46a3066aae3b76525ab8a93e71627281d1989f1e89d1150a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f3ec3f5da2a1e8e0b58252deb945accf7dd7c50cd34ff74a927f15f322ea8352b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a04ac8515361f4b5d52cd4162c19171fecaca8c49140e397cd1a871f317fa8d4b188497c9ba96c1e6e7ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a081fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e0bbe7bee0a1dfd3c46a3066aae3b76525ab8a93e71627281d1989f1e89d1150a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f3ec3f5da2a1e8e0b58252deb945accf7dd7c50cd34ff74a927f15f322ea8352b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0c9c9c67b1bb5ded943cae4b9c4a8c56fb136c1f1df9e5812ffb60e849890403288f3f0f0260f197caaf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "63c6978d3ab1a4f17965a6227d267e071753f752913e22b4a113e9af1bf64a15",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x63c6978d3ab1a4f17965a6227d267e071753f752913e22b4a113e9af1bf64a15",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063c6978d3ab1a4f17965a6227d267e071753f752913e22b4a113e9af1bf64a15a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "672997cae483226dbc545bf5bea0a7a52f00959e881c80ed0d9d48ea229eb658",
+        "lastblockhash" : "0x9fcf528eec9cb6aaacf780bea6683708e81a730637f3b913fa4060c8ac1899d2",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -78,74 +83,74 @@
                     "0x07" : "0x03"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f804a3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ffb5d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -153,36 +158,41 @@
         }
     },
     "callcodecallcodecallcode_111_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "b1c7031dfa92de07d48cf9d2b8dc8038959f2548e96fa846c04ff2137556c20f",
-                    "mixHash" : "63800b6a3443d1d1aaee5fc20c22bd428bd0c2c557bf2425389533b45665da66",
-                    "nonce" : "b4ea72381be51da8",
+                    "hash" : "0x6b02f9f50d5e1144c0672992d62bb781cf7de94c62ed8f8c42171f1e6376e6d0",
+                    "mixHash" : "0xbf1600301ce84685c35eb57cee0689b6e9fcab0de7f1955e33ce9e4726241a19",
+                    "nonce" : "0xdc157da5cf2c1323",
                     "number" : "0x01",
-                    "parentHash" : "81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
-                    "receiptTrie" : "f3ec3f5da2a1e8e0b58252deb945accf7dd7c50cd34ff74a927f15f322ea8352",
-                    "stateRoot" : "e0bbe7bee0a1dfd3c46a3066aae3b76525ab8a93e71627281d1989f1e89d1150",
+                    "parentHash" : "0x81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
+                    "receiptTrie" : "0xf3ec3f5da2a1e8e0b58252deb945accf7dd7c50cd34ff74a927f15f322ea8352",
+                    "stateRoot" : "0xe0bbe7bee0a1dfd3c46a3066aae3b76525ab8a93e71627281d1989f1e89d1150",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a081fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e0bbe7bee0a1dfd3c46a3066aae3b76525ab8a93e71627281d1989f1e89d1150a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f3ec3f5da2a1e8e0b58252deb945accf7dd7c50cd34ff74a927f15f322ea8352b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a063800b6a3443d1d1aaee5fc20c22bd428bd0c2c557bf2425389533b45665da6688b4ea72381be51da8f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a081fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e0bbe7bee0a1dfd3c46a3066aae3b76525ab8a93e71627281d1989f1e89d1150a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f3ec3f5da2a1e8e0b58252deb945accf7dd7c50cd34ff74a927f15f322ea8352b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0bf1600301ce84685c35eb57cee0689b6e9fcab0de7f1955e33ce9e4726241a1988dc157da5cf2c1323f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -192,28 +202,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "63c6978d3ab1a4f17965a6227d267e071753f752913e22b4a113e9af1bf64a15",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x63c6978d3ab1a4f17965a6227d267e071753f752913e22b4a113e9af1bf64a15",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063c6978d3ab1a4f17965a6227d267e071753f752913e22b4a113e9af1bf64a15a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b1c7031dfa92de07d48cf9d2b8dc8038959f2548e96fa846c04ff2137556c20f",
+        "lastblockhash" : "0x6b02f9f50d5e1144c0672992d62bb781cf7de94c62ed8f8c42171f1e6376e6d0",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -231,74 +241,74 @@
                     "0x07" : "0x03"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f804a3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ffb5d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -306,36 +316,41 @@
         }
     },
     "callcodecallcodecallcode_111_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "87410f5b83ee51b3f77a3816ecd5c41ae659c9bd761e957ccef4edbd85b0659f",
-                    "mixHash" : "6f3958bca530be9d660e536f4e1df572cd01d54174be4f86ea01e18e8e57818b",
-                    "nonce" : "ec60dde7d9d874d2",
+                    "hash" : "0x3f77ae4c84cfdf0a81ec487789a3973ea8e00e592da73d9a65022fbb493d1125",
+                    "mixHash" : "0x9c16b5a23ba4ba2e7da14da858453f87b817a1a7b4e4cd66bf16b10725c26ec2",
+                    "nonce" : "0xd809a2dcb5580728",
                     "number" : "0x01",
-                    "parentHash" : "81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
-                    "receiptTrie" : "40117d8bcc0572f6af98ace01395dc51429170100ac1928a11866c0371f58eda",
-                    "stateRoot" : "a492fac14f892ae18d8e7e41b7a804b324d58a53d92fa972be11b09b6374c0c4",
+                    "parentHash" : "0x81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
+                    "receiptTrie" : "0x40117d8bcc0572f6af98ace01395dc51429170100ac1928a11866c0371f58eda",
+                    "stateRoot" : "0xa492fac14f892ae18d8e7e41b7a804b324d58a53d92fa972be11b09b6374c0c4",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a081fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a492fac14f892ae18d8e7e41b7a804b324d58a53d92fa972be11b09b6374c0c4a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040117d8bcc0572f6af98ace01395dc51429170100ac1928a11866c0371f58edab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a06f3958bca530be9d660e536f4e1df572cd01d54174be4f86ea01e18e8e57818b88ec60dde7d9d874d2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a081fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a492fac14f892ae18d8e7e41b7a804b324d58a53d92fa972be11b09b6374c0c4a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040117d8bcc0572f6af98ace01395dc51429170100ac1928a11866c0371f58edab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a09c16b5a23ba4ba2e7da14da858453f87b817a1a7b4e4cd66bf16b10725c26ec288d809a2dcb5580728f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -345,28 +360,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "63c6978d3ab1a4f17965a6227d267e071753f752913e22b4a113e9af1bf64a15",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x63c6978d3ab1a4f17965a6227d267e071753f752913e22b4a113e9af1bf64a15",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063c6978d3ab1a4f17965a6227d267e071753f752913e22b4a113e9af1bf64a15a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "87410f5b83ee51b3f77a3816ecd5c41ae659c9bd761e957ccef4edbd85b0659f",
+        "lastblockhash" : "0x3f77ae4c84cfdf0a81ec487789a3973ea8e00e592da73d9a65022fbb493d1125",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -384,74 +399,74 @@
                     "0x07" : "0x03"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7fce7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7600319",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -459,36 +474,41 @@
         }
     },
     "callcodecallcodecallcode_111_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "04a2373af1d635126d579964a72b460af564b01246e9a36dbc3945d285cabdc9",
-                    "mixHash" : "4e9b15c9a039dda9dcf18ff67a5f7403b60a1c17ad8f3b0ffd0290e205dd0512",
-                    "nonce" : "ded07047375a8d71",
+                    "hash" : "0x5d7d543783e6e817ef10ac3fe26785148d3476fb59819b1530f677af601713bd",
+                    "mixHash" : "0xcd2f3711f07872fff49b732300d06d58be942a7b41d7f619860efb66469b395d",
+                    "nonce" : "0x443f66008f727567",
                     "number" : "0x01",
-                    "parentHash" : "81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
-                    "receiptTrie" : "40117d8bcc0572f6af98ace01395dc51429170100ac1928a11866c0371f58eda",
-                    "stateRoot" : "a492fac14f892ae18d8e7e41b7a804b324d58a53d92fa972be11b09b6374c0c4",
+                    "parentHash" : "0x81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
+                    "receiptTrie" : "0x40117d8bcc0572f6af98ace01395dc51429170100ac1928a11866c0371f58eda",
+                    "stateRoot" : "0xa492fac14f892ae18d8e7e41b7a804b324d58a53d92fa972be11b09b6374c0c4",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a081fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a492fac14f892ae18d8e7e41b7a804b324d58a53d92fa972be11b09b6374c0c4a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040117d8bcc0572f6af98ace01395dc51429170100ac1928a11866c0371f58edab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a04e9b15c9a039dda9dcf18ff67a5f7403b60a1c17ad8f3b0ffd0290e205dd051288ded07047375a8d71f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a081fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a492fac14f892ae18d8e7e41b7a804b324d58a53d92fa972be11b09b6374c0c4a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040117d8bcc0572f6af98ace01395dc51429170100ac1928a11866c0371f58edab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0cd2f3711f07872fff49b732300d06d58be942a7b41d7f619860efb66469b395d88443f66008f727567f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
                         "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -498,28 +518,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "63c6978d3ab1a4f17965a6227d267e071753f752913e22b4a113e9af1bf64a15",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x63c6978d3ab1a4f17965a6227d267e071753f752913e22b4a113e9af1bf64a15",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063c6978d3ab1a4f17965a6227d267e071753f752913e22b4a113e9af1bf64a15a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "04a2373af1d635126d579964a72b460af564b01246e9a36dbc3945d285cabdc9",
+        "lastblockhash" : "0x5d7d543783e6e817ef10ac3fe26785148d3476fb59819b1530f677af601713bd",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
@@ -537,74 +557,239 @@
                     "0x07" : "0x03"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7fce7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7600319",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0xe17694569c48cd1b9e79f9c4cdab35992eb4b1b8a7d48d62529a5b5af15a769f",
+                    "mixHash" : "0x8d4b073f0686bb4be46a836b0bd58cde7b277123cb887e10beae6ae67acaea25",
+                    "nonce" : "0xc1d101e0b7c4b335",
+                    "number" : "0x01",
+                    "parentHash" : "0x81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0x94e55876c4a910a86980f45821c23a22763b1052417eda9a5e041c86abdec253",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a081fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094e55876c4a910a86980f45821c23a22763b1052417eda9a5e041c86abdec253a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a08d4b073f0686bb4be46a836b0bd58cde7b277123cb887e10beae6ae67acaea2588c1d101e0b7c4b335f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xe17694569c48cd1b9e79f9c4cdab35992eb4b1b8a7d48d62529a5b5af15a769f",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0.json
index 1223401d4..e5556ac10 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "a48e2daad071354a6218113d24b11fd268cf9edf79c3852327fcd1608c6421e7",
-                    "mixHash" : "ad6a8b1d733552244a4d57f5e35b17cfb7e42a9b4597240c95cbdbe7d883c0bf",
-                    "nonce" : "1c7891cfd4988350",
+                    "hash" : "0xc89fa3d4b1f9495a7f7adcc74984ee3a47f2382a5cdff3f83c1ea3f0f5e9d881",
+                    "mixHash" : "0x92a52b2f96a09ae4ab7875db98363c268335023c1ceba2bf93eacfb1cdc69ab9",
+                    "nonce" : "0xa43c9f7458fa2e80",
                     "number" : "0x01",
-                    "parentHash" : "dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
-                    "receiptTrie" : "8aa47b435083b079c7d820ab44bb5e85c7f53d63e65bcce0e670276fe01e2596",
-                    "stateRoot" : "83c7648973abe1384750f404c82016b837ab2dec5211caf99b7551f58a4e954e",
+                    "parentHash" : "0xdd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
+                    "receiptTrie" : "0x8aa47b435083b079c7d820ab44bb5e85c7f53d63e65bcce0e670276fe01e2596",
+                    "stateRoot" : "0x83c7648973abe1384750f404c82016b837ab2dec5211caf99b7551f58a4e954e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083c7648973abe1384750f404c82016b837ab2dec5211caf99b7551f58a4e954ea06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a08aa47b435083b079c7d820ab44bb5e85c7f53d63e65bcce0e670276fe01e2596b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0ad6a8b1d733552244a4d57f5e35b17cfb7e42a9b4597240c95cbdbe7d883c0bf881c7891cfd4988350f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083c7648973abe1384750f404c82016b837ab2dec5211caf99b7551f58a4e954ea06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a08aa47b435083b079c7d820ab44bb5e85c7f53d63e65bcce0e670276fe01e2596b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a092a52b2f96a09ae4ab7875db98363c268335023c1ceba2bf93eacfb1cdc69ab988a43c9f7458fa2e80f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xdd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "84dbef3fc203218b5d28cbe1758e36787e2c50e7ec61ce48751ca60e39b4d346",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x84dbef3fc203218b5d28cbe1758e36787e2c50e7ec61ce48751ca60e39b4d346",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084dbef3fc203218b5d28cbe1758e36787e2c50e7ec61ce48751ca60e39b4d346a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a48e2daad071354a6218113d24b11fd268cf9edf79c3852327fcd1608c6421e7",
+        "lastblockhash" : "0xc89fa3d4b1f9495a7f7adcc74984ee3a47f2382a5cdff3f83c1ea3f0f5e9d881",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
@@ -69,60 +74,60 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fcab7e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5482",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -130,36 +135,41 @@
         }
     },
     "callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "b66a1fd69a37a719195112458843d66112dc6c2e55c84bbfec57231bb5fa425d",
-                    "mixHash" : "f53a212f18d6d656929c23ffbcbabb69a3ec76fd2fbd475cb5d9cd205e9eac13",
-                    "nonce" : "127b34f43f2e875b",
+                    "hash" : "0xd07d4d76ca54cb741e5e60f5ec118e6d8b663c224ea4eae8f5a9d6bedc4ba88a",
+                    "mixHash" : "0xeb2d019b92db5690f98e100756130db945fd988b255894ce89a2d4a08873e986",
+                    "nonce" : "0xab2515d91033a872",
                     "number" : "0x01",
-                    "parentHash" : "dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
-                    "receiptTrie" : "8aa47b435083b079c7d820ab44bb5e85c7f53d63e65bcce0e670276fe01e2596",
-                    "stateRoot" : "83c7648973abe1384750f404c82016b837ab2dec5211caf99b7551f58a4e954e",
+                    "parentHash" : "0xdd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
+                    "receiptTrie" : "0x8aa47b435083b079c7d820ab44bb5e85c7f53d63e65bcce0e670276fe01e2596",
+                    "stateRoot" : "0x83c7648973abe1384750f404c82016b837ab2dec5211caf99b7551f58a4e954e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083c7648973abe1384750f404c82016b837ab2dec5211caf99b7551f58a4e954ea06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a08aa47b435083b079c7d820ab44bb5e85c7f53d63e65bcce0e670276fe01e2596b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0f53a212f18d6d656929c23ffbcbabb69a3ec76fd2fbd475cb5d9cd205e9eac1388127b34f43f2e875bf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083c7648973abe1384750f404c82016b837ab2dec5211caf99b7551f58a4e954ea06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a08aa47b435083b079c7d820ab44bb5e85c7f53d63e65bcce0e670276fe01e2596b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0eb2d019b92db5690f98e100756130db945fd988b255894ce89a2d4a08873e98688ab2515d91033a872f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -169,28 +179,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xdd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "84dbef3fc203218b5d28cbe1758e36787e2c50e7ec61ce48751ca60e39b4d346",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x84dbef3fc203218b5d28cbe1758e36787e2c50e7ec61ce48751ca60e39b4d346",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084dbef3fc203218b5d28cbe1758e36787e2c50e7ec61ce48751ca60e39b4d346a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b66a1fd69a37a719195112458843d66112dc6c2e55c84bbfec57231bb5fa425d",
+        "lastblockhash" : "0xd07d4d76ca54cb741e5e60f5ec118e6d8b663c224ea4eae8f5a9d6bedc4ba88a",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
@@ -199,60 +209,60 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fcab7e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5482",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -260,36 +270,41 @@
         }
     },
     "callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "2be480002196dce11d769b7c33084e939a6a4f8866b0da1e8cde334d04092343",
-                    "mixHash" : "e20cf2e3b1d9338bdb403e44271a3bb1f946aca4ff6349f545c29bcf6781c013",
-                    "nonce" : "d89af77fe24bb69d",
+                    "hash" : "0x5369d55950d0744ffd06511761290ecdbbfb31fa37492323984154a94b330959",
+                    "mixHash" : "0xb5bd5ad7d706720cf8e91cdbf281786efb3d81390bdfc1340111c50640f53e72",
+                    "nonce" : "0xac9102b6d266f896",
                     "number" : "0x01",
-                    "parentHash" : "dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
-                    "receiptTrie" : "7d84ce8e249b1fa4e7d607700f13cb47c3c01226919ddc011619f9ead53a2e52",
-                    "stateRoot" : "2abf7a7afb41ad0678b45b2227c0ba8cc40c6cf830b1bdb7737a9cda7a87a9de",
+                    "parentHash" : "0xdd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
+                    "receiptTrie" : "0x7d84ce8e249b1fa4e7d607700f13cb47c3c01226919ddc011619f9ead53a2e52",
+                    "stateRoot" : "0x2abf7a7afb41ad0678b45b2227c0ba8cc40c6cf830b1bdb7737a9cda7a87a9de",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02abf7a7afb41ad0678b45b2227c0ba8cc40c6cf830b1bdb7737a9cda7a87a9dea06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a07d84ce8e249b1fa4e7d607700f13cb47c3c01226919ddc011619f9ead53a2e52b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0e20cf2e3b1d9338bdb403e44271a3bb1f946aca4ff6349f545c29bcf6781c01388d89af77fe24bb69df863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02abf7a7afb41ad0678b45b2227c0ba8cc40c6cf830b1bdb7737a9cda7a87a9dea06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a07d84ce8e249b1fa4e7d607700f13cb47c3c01226919ddc011619f9ead53a2e52b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0b5bd5ad7d706720cf8e91cdbf281786efb3d81390bdfc1340111c50640f53e7288ac9102b6d266f896f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -299,28 +314,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xdd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "84dbef3fc203218b5d28cbe1758e36787e2c50e7ec61ce48751ca60e39b4d346",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x84dbef3fc203218b5d28cbe1758e36787e2c50e7ec61ce48751ca60e39b4d346",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084dbef3fc203218b5d28cbe1758e36787e2c50e7ec61ce48751ca60e39b4d346a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2be480002196dce11d769b7c33084e939a6a4f8866b0da1e8cde334d04092343",
+        "lastblockhash" : "0x5369d55950d0744ffd06511761290ecdbbfb31fa37492323984154a94b330959",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
@@ -329,60 +344,60 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fca3c2",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5c3e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -390,36 +405,41 @@
         }
     },
     "callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "bb49cdbb0b357895e67f8e3f3cb037f0714129ab2125880f22ac823961c8b449",
-                    "mixHash" : "ce356341868a8b3c4d0fbcf70f6813ed55f317264c9a1800b5fb075c4ded353d",
-                    "nonce" : "07e6d739e63e8451",
+                    "hash" : "0x9bd0059c2f8ed04306e82414f95e1fe71aec688a5f556ea74290e477840a522e",
+                    "mixHash" : "0xbe940aa8914a1d16ca7c7121d732e95d0e66270c88cca61573f2df3c6fd434e2",
+                    "nonce" : "0x3001b601589d3df8",
                     "number" : "0x01",
-                    "parentHash" : "dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
-                    "receiptTrie" : "7d84ce8e249b1fa4e7d607700f13cb47c3c01226919ddc011619f9ead53a2e52",
-                    "stateRoot" : "2abf7a7afb41ad0678b45b2227c0ba8cc40c6cf830b1bdb7737a9cda7a87a9de",
+                    "parentHash" : "0xdd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
+                    "receiptTrie" : "0x7d84ce8e249b1fa4e7d607700f13cb47c3c01226919ddc011619f9ead53a2e52",
+                    "stateRoot" : "0x2abf7a7afb41ad0678b45b2227c0ba8cc40c6cf830b1bdb7737a9cda7a87a9de",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02abf7a7afb41ad0678b45b2227c0ba8cc40c6cf830b1bdb7737a9cda7a87a9dea06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a07d84ce8e249b1fa4e7d607700f13cb47c3c01226919ddc011619f9ead53a2e52b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0ce356341868a8b3c4d0fbcf70f6813ed55f317264c9a1800b5fb075c4ded353d8807e6d739e63e8451f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02abf7a7afb41ad0678b45b2227c0ba8cc40c6cf830b1bdb7737a9cda7a87a9dea06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a07d84ce8e249b1fa4e7d607700f13cb47c3c01226919ddc011619f9ead53a2e52b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0be940aa8914a1d16ca7c7121d732e95d0e66270c88cca61573f2df3c6fd434e2883001b601589d3df8f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
                         "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -429,28 +449,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0xb2d05e00",
             "gasUsed" : "0x00",
-            "hash" : "dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xdd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "84dbef3fc203218b5d28cbe1758e36787e2c50e7ec61ce48751ca60e39b4d346",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x84dbef3fc203218b5d28cbe1758e36787e2c50e7ec61ce48751ca60e39b4d346",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084dbef3fc203218b5d28cbe1758e36787e2c50e7ec61ce48751ca60e39b4d346a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "bb49cdbb0b357895e67f8e3f3cb037f0714129ab2125880f22ac823961c8b449",
+        "lastblockhash" : "0x9bd0059c2f8ed04306e82414f95e1fe71aec688a5f556ea74290e477840a522e",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
@@ -459,60 +479,202 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fca3c2",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75b5c3e",
-                "code" : "0x",
+                "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_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.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" : "0xca1ae68245e9b040c860eee71393d8ea62afc4f53dbcaec6bd7f2e7acf236fb5",
+                    "mixHash" : "0xab3ed4e3ff81e45aa434183d8db2a68dd284874273497bbaf4e0da5ed7a458e2",
+                    "nonce" : "0xece71d6f2d5237d8",
+                    "number" : "0x01",
+                    "parentHash" : "0xdd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0xa4e7cddad827504b0962d34e3a45edaddc847ec923575b71c74b1c4a66441fec",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a4e7cddad827504b0962d34e3a45edaddc847ec923575b71c74b1c4a66441feca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0ab3ed4e3ff81e45aa434183d8db2a68dd284874273497bbaf4e0da5ed7a458e288ece71d6f2d5237d8f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "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" : "0xca1ae68245e9b040c860eee71393d8ea62afc4f53dbcaec6bd7f2e7acf236fb5",
+        "network" : "Metropolis",
+        "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" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }