regenerate hive tests

24 files changed, 6767 insertions, 3412 deletions

diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty_d0g0v0.json
index 26bca01d4..c83ea2cad 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "NonZeroValue_CALLCODE_ToEmpty_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015972",
-                    "hash" : "c1ceb2809642d90cfc47f8121f4a6918f3b552dfed5e86f73518485548466e19",
-                    "mixHash" : "b1ca12356af7ab090f6ab0e531fca7220cd5cd130585f26f4ef00ded4bda2ff2",
-                    "nonce" : "e76b785a3163c651",
+                    "hash" : "0x3239e4690cf58c05ee26d706d53c8370fe52f14396c4804456e56d48a1a80597",
+                    "mixHash" : "0xaea05db1f51337caeb4dc98c11490716b4d4b7652597eef1d111c20198234feb",
+                    "nonce" : "0x7e17bc2fb632e220",
                     "number" : "0x01",
-                    "parentHash" : "9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
-                    "receiptTrie" : "7fb7353e38604f28f21651d12e70055d88740bf64e8f27e3889de98f3fcfcac9",
-                    "stateRoot" : "bda41e439b969d4eb21517d5eae6fae3d1175205edc51df040549e961c19ac2d",
+                    "parentHash" : "0x9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
+                    "receiptTrie" : "0x7fb7353e38604f28f21651d12e70055d88740bf64e8f27e3889de98f3fcfcac9",
+                    "stateRoot" : "0xbda41e439b969d4eb21517d5eae6fae3d1175205edc51df040549e961c19ac2d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a09385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bda41e439b969d4eb21517d5eae6fae3d1175205edc51df040549e961c19ac2da059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a07fb7353e38604f28f21651d12e70055d88740bf64e8f27e3889de98f3fcfcac9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a0b1ca12356af7ab090f6ab0e531fca7220cd5cd130585f26f4ef00ded4bda2ff288e76b785a3163c651f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a09385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bda41e439b969d4eb21517d5eae6fae3d1175205edc51df040549e961c19ac2da059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a07fb7353e38604f28f21651d12e70055d88740bf64e8f27e3889de98f3fcfcac9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a0aea05db1f51337caeb4dc98c11490716b4d4b7652597eef1d111c20198234feb887e17bc2fb632e220f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,42 +44,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b581d4cfc01ddf5f25d418234a2fed8cc7eedecfae6da89fa6ad93aea8587f5d",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb581d4cfc01ddf5f25d418234a2fed8cc7eedecfae6da89fa6ad93aea8587f5d",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b581d4cfc01ddf5f25d418234a2fed8cc7eedecfae6da89fa6ad93aea8587f5da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c1ceb2809642d90cfc47f8121f4a6918f3b552dfed5e86f73518485548466e19",
+        "lastblockhash" : "0x3239e4690cf58c05ee26d706d53c8370fe52f14396c4804456e56d48a1a80597",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55972",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3b68e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
@@ -84,32 +89,32 @@
                     "0x64" : "0x081c71"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -117,36 +122,41 @@
         }
     },
     "NonZeroValue_CALLCODE_ToEmpty_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015972",
-                    "hash" : "e6a5a7a99a32db2f347e081a7de353557e6108e938a85deda4fc64e6c5d7d109",
-                    "mixHash" : "ad7920e74be239843bbe94ab6f3e444a973ed7daabb639c4bdf9826a9ccaba8a",
-                    "nonce" : "bd40a861b3d48fff",
+                    "hash" : "0xec24b6d4043ee6028fb1d6c37f7227bbcd30dc34ac60610ef49a0257011c5fbd",
+                    "mixHash" : "0x2e2e647453991c53ac89590f020367335bd826f3a8bd1d7bca549cebdef71348",
+                    "nonce" : "0xcf393dccf852faa1",
                     "number" : "0x01",
-                    "parentHash" : "9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
-                    "receiptTrie" : "7fb7353e38604f28f21651d12e70055d88740bf64e8f27e3889de98f3fcfcac9",
-                    "stateRoot" : "bda41e439b969d4eb21517d5eae6fae3d1175205edc51df040549e961c19ac2d",
+                    "parentHash" : "0x9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
+                    "receiptTrie" : "0x7fb7353e38604f28f21651d12e70055d88740bf64e8f27e3889de98f3fcfcac9",
+                    "stateRoot" : "0xbda41e439b969d4eb21517d5eae6fae3d1175205edc51df040549e961c19ac2d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a09385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bda41e439b969d4eb21517d5eae6fae3d1175205edc51df040549e961c19ac2da059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a07fb7353e38604f28f21651d12e70055d88740bf64e8f27e3889de98f3fcfcac9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a0ad7920e74be239843bbe94ab6f3e444a973ed7daabb639c4bdf9826a9ccaba8a88bd40a861b3d48ffff862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a09385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bda41e439b969d4eb21517d5eae6fae3d1175205edc51df040549e961c19ac2da059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a07fb7353e38604f28f21651d12e70055d88740bf64e8f27e3889de98f3fcfcac9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a02e2e647453991c53ac89590f020367335bd826f3a8bd1d7bca549cebdef7134888cf393dccf852faa1f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -156,42 +166,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b581d4cfc01ddf5f25d418234a2fed8cc7eedecfae6da89fa6ad93aea8587f5d",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb581d4cfc01ddf5f25d418234a2fed8cc7eedecfae6da89fa6ad93aea8587f5d",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b581d4cfc01ddf5f25d418234a2fed8cc7eedecfae6da89fa6ad93aea8587f5da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e6a5a7a99a32db2f347e081a7de353557e6108e938a85deda4fc64e6c5d7d109",
+        "lastblockhash" : "0xec24b6d4043ee6028fb1d6c37f7227bbcd30dc34ac60610ef49a0257011c5fbd",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55972",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3b68e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
@@ -201,32 +211,32 @@
                     "0x64" : "0x081c71"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -234,36 +244,41 @@
         }
     },
     "NonZeroValue_CALLCODE_ToEmpty_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0156de",
-                    "hash" : "290c8ab219874e34968108b1e9f37296ad47af872973d59a2a6302e59d6c772a",
-                    "mixHash" : "53386e07096b65e217147183a284d09c41f14d2bf3ce9c2d45a180aae5228ebd",
-                    "nonce" : "2247d597fff4823c",
+                    "hash" : "0x0342ce902ada1d50a63d157f899ad8a23db61b2c9fc8ed41bd49b680e8289845",
+                    "mixHash" : "0xbefc3213233d345939014905efcea9336fdcbe2b3e7955b0e5d7b9af7c5fba57",
+                    "nonce" : "0xe15f0491d1e80e67",
                     "number" : "0x01",
-                    "parentHash" : "9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
-                    "receiptTrie" : "40b343d2c6884dba0db2688e87b24ca01ec04f04af672aed1af29a2493e0bf12",
-                    "stateRoot" : "c1bf1f3bea000131650e3605a4a39ca9b305405cf7743e560079374ca264bcd0",
+                    "parentHash" : "0x9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
+                    "receiptTrie" : "0x40b343d2c6884dba0db2688e87b24ca01ec04f04af672aed1af29a2493e0bf12",
+                    "stateRoot" : "0xc1bf1f3bea000131650e3605a4a39ca9b305405cf7743e560079374ca264bcd0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a09385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1bf1f3bea000131650e3605a4a39ca9b305405cf7743e560079374ca264bcd0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a040b343d2c6884dba0db2688e87b24ca01ec04f04af672aed1af29a2493e0bf12b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a053386e07096b65e217147183a284d09c41f14d2bf3ce9c2d45a180aae5228ebd882247d597fff4823cf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a09385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1bf1f3bea000131650e3605a4a39ca9b305405cf7743e560079374ca264bcd0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a040b343d2c6884dba0db2688e87b24ca01ec04f04af672aed1af29a2493e0bf12b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a0befc3213233d345939014905efcea9336fdcbe2b3e7955b0e5d7b9af7c5fba5788e15f0491d1e80e67f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -273,42 +288,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b581d4cfc01ddf5f25d418234a2fed8cc7eedecfae6da89fa6ad93aea8587f5d",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb581d4cfc01ddf5f25d418234a2fed8cc7eedecfae6da89fa6ad93aea8587f5d",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b581d4cfc01ddf5f25d418234a2fed8cc7eedecfae6da89fa6ad93aea8587f5da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "290c8ab219874e34968108b1e9f37296ad47af872973d59a2a6302e59d6c772a",
+        "lastblockhash" : "0x0342ce902ada1d50a63d157f899ad8a23db61b2c9fc8ed41bd49b680e8289845",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f556de",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3b922",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
@@ -318,32 +333,32 @@
                     "0x64" : "0x081f05"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -351,36 +366,41 @@
         }
     },
     "NonZeroValue_CALLCODE_ToEmpty_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0156de",
-                    "hash" : "ce9817e8a7ee7b87b295afa9e00e4b97f3c6ab4022094db81c82b57105e82887",
-                    "mixHash" : "dccaaca3deb259c572e0a3f6ddbd5728d5162cbef54c40659475b7d23b40a1f1",
-                    "nonce" : "d1c7c9bcab4abc41",
+                    "hash" : "0x1130ea60f2d4cd38fb5cd9b1589bf08b35d17a85fa156b2389fe97a7b224611b",
+                    "mixHash" : "0x4b059ea7d923cf38d078a4f9e983e1b014a9353dc2de840fd8bad793a8a56cd6",
+                    "nonce" : "0x0387b8167972e4ee",
                     "number" : "0x01",
-                    "parentHash" : "9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
-                    "receiptTrie" : "40b343d2c6884dba0db2688e87b24ca01ec04f04af672aed1af29a2493e0bf12",
-                    "stateRoot" : "c1bf1f3bea000131650e3605a4a39ca9b305405cf7743e560079374ca264bcd0",
+                    "parentHash" : "0x9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
+                    "receiptTrie" : "0x40b343d2c6884dba0db2688e87b24ca01ec04f04af672aed1af29a2493e0bf12",
+                    "stateRoot" : "0xc1bf1f3bea000131650e3605a4a39ca9b305405cf7743e560079374ca264bcd0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a09385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1bf1f3bea000131650e3605a4a39ca9b305405cf7743e560079374ca264bcd0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a040b343d2c6884dba0db2688e87b24ca01ec04f04af672aed1af29a2493e0bf12b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a0dccaaca3deb259c572e0a3f6ddbd5728d5162cbef54c40659475b7d23b40a1f188d1c7c9bcab4abc41f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a09385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1bf1f3bea000131650e3605a4a39ca9b305405cf7743e560079374ca264bcd0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a040b343d2c6884dba0db2688e87b24ca01ec04f04af672aed1af29a2493e0bf12b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a04b059ea7d923cf38d078a4f9e983e1b014a9353dc2de840fd8bad793a8a56cd6880387b8167972e4eef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -390,42 +410,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b581d4cfc01ddf5f25d418234a2fed8cc7eedecfae6da89fa6ad93aea8587f5d",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb581d4cfc01ddf5f25d418234a2fed8cc7eedecfae6da89fa6ad93aea8587f5d",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b581d4cfc01ddf5f25d418234a2fed8cc7eedecfae6da89fa6ad93aea8587f5da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ce9817e8a7ee7b87b295afa9e00e4b97f3c6ab4022094db81c82b57105e82887",
+        "lastblockhash" : "0x1130ea60f2d4cd38fb5cd9b1589bf08b35d17a85fa156b2389fe97a7b224611b",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f556de",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3b922",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
@@ -435,32 +455,161 @@
                     "0x64" : "0x081f05"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NonZeroValue_CALLCODE_ToEmpty_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x015972",
+                    "hash" : "0x34e5de4dd77300d6e5fba55820e5daefcef22be50a6ca2adbba840a9ac730ad0",
+                    "mixHash" : "0x8f25e0760f9e417e5d66d6862e17cdfdb492888bdad00fb1b1fb5bf3e63b994a",
+                    "nonce" : "0x0fe27489c6fc17fc",
+                    "number" : "0x01",
+                    "parentHash" : "0x9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
+                    "receiptTrie" : "0x540ef40122c0819161100cb02570d8bacc522b2db8c86e328ed93907dfc77546",
+                    "stateRoot" : "0xee926178981c5741dcac3fe6668785d9700d1224831571a1b19900e9a4005ad3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a09385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee926178981c5741dcac3fe6668785d9700d1224831571a1b19900e9a4005ad3a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0540ef40122c0819161100cb02570d8bacc522b2db8c86e328ed93907dfc77546b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a08f25e0760f9e417e5d66d6862e17cdfdb492888bdad00fb1b1fb5bf3e63b994a880fe27489c6fc17fcf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb581d4cfc01ddf5f25d418234a2fed8cc7eedecfae6da89fa6ad93aea8587f5d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b581d4cfc01ddf5f25d418234a2fed8cc7eedecfae6da89fa6ad93aea8587f5da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x34e5de4dd77300d6e5fba55820e5daefcef22be50a6ca2adbba840a9ac730ad0",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55972",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3b68e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x08d5b6",
+                    "0x01" : "0x01",
+                    "0x64" : "0x081c71"
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalance.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalance_d0g0v0.json
index d396bc8bc..a33418416 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalance.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalance_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "NonZeroValue_CALLCODE_ToNonNonZeroBalance_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011eda",
-                    "hash" : "071a49be0f9f99fc7037986ea4d531ab018b528ff71ace32a375ea80fb4161af",
-                    "mixHash" : "51a7b7b4b57347a6ac1b3d2cd33a59fa72a77d63febed1099997b806f6f2f48d",
-                    "nonce" : "5589e5935339a737",
+                    "hash" : "0xa1a6a5e0a893c0732d21fa66de872aaef1ca5c10ff0bdff764e0a727ab7ccafa",
+                    "mixHash" : "0xbc6fba7f0ac55c9c1b4acc213078db6c356059f6761e00b85d6cb5a46da3d1a5",
+                    "nonce" : "0x438b00f82bf49056",
                     "number" : "0x01",
-                    "parentHash" : "6757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766ba",
-                    "receiptTrie" : "c391a4626d24ecb7d811a8f34e8462bf2d65b8512426e64141d157c6e88d61c4",
-                    "stateRoot" : "a3d598776c1059c1f5c05cf74e5128f2eb8698a23c65e613458c02219a571dd8",
+                    "parentHash" : "0x6757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766ba",
+                    "receiptTrie" : "0xc391a4626d24ecb7d811a8f34e8462bf2d65b8512426e64141d157c6e88d61c4",
+                    "stateRoot" : "0xa3d598776c1059c1f5c05cf74e5128f2eb8698a23c65e613458c02219a571dd8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766baa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3d598776c1059c1f5c05cf74e5128f2eb8698a23c65e613458c02219a571dd8a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0c391a4626d24ecb7d811a8f34e8462bf2d65b8512426e64141d157c6e88d61c4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011eda8203e880a051a7b7b4b57347a6ac1b3d2cd33a59fa72a77d63febed1099997b806f6f2f48d885589e5935339a737f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a06757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766baa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3d598776c1059c1f5c05cf74e5128f2eb8698a23c65e613458c02219a571dd8a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0c391a4626d24ecb7d811a8f34e8462bf2d65b8512426e64141d157c6e88d61c4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011eda8203e880a0bc6fba7f0ac55c9c1b4acc213078db6c356059f6761e00b85d6cb5a46da3d1a588438b00f82bf49056f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,42 +44,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "6757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766ba",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766ba",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6fcb6bfe64643afa01ff67d9275a14814bc67752f15589b00510061518aab448",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6fcb6bfe64643afa01ff67d9275a14814bc67752f15589b00510061518aab448",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fcb6bfe64643afa01ff67d9275a14814bc67752f15589b00510061518aab448a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "071a49be0f9f99fc7037986ea4d531ab018b528ff71ace32a375ea80fb4161af",
+        "lastblockhash" : "0xa1a6a5e0a893c0732d21fa66de872aaef1ca5c10ff0bdff764e0a727ab7ccafa",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51eda",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3f126",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
@@ -83,32 +88,32 @@
                     "0x64" : "0x085709"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -116,36 +121,41 @@
         }
     },
     "NonZeroValue_CALLCODE_ToNonNonZeroBalance_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011eda",
-                    "hash" : "96a50583c6682d9e00e78dace72e167cc7f63d552e237509c782d28b79275a84",
-                    "mixHash" : "977b75f1137ef0013ff1ae4d7b3e4cbcdc9da2d2ec45c4cf4baf5ce19b283310",
-                    "nonce" : "7e87f09d0a26b6bc",
+                    "hash" : "0xdbfa14f1c2698067a79139f46151455c55af7abff1e4c1b441b0ec14ec207d77",
+                    "mixHash" : "0x55fe864a62f959a039aca55b76fb939150deef55ea21b1a268f3d26772a41f3e",
+                    "nonce" : "0xa77517f79e8902d1",
                     "number" : "0x01",
-                    "parentHash" : "6757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766ba",
-                    "receiptTrie" : "c391a4626d24ecb7d811a8f34e8462bf2d65b8512426e64141d157c6e88d61c4",
-                    "stateRoot" : "a3d598776c1059c1f5c05cf74e5128f2eb8698a23c65e613458c02219a571dd8",
+                    "parentHash" : "0x6757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766ba",
+                    "receiptTrie" : "0xc391a4626d24ecb7d811a8f34e8462bf2d65b8512426e64141d157c6e88d61c4",
+                    "stateRoot" : "0xa3d598776c1059c1f5c05cf74e5128f2eb8698a23c65e613458c02219a571dd8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766baa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3d598776c1059c1f5c05cf74e5128f2eb8698a23c65e613458c02219a571dd8a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0c391a4626d24ecb7d811a8f34e8462bf2d65b8512426e64141d157c6e88d61c4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011eda8203e880a0977b75f1137ef0013ff1ae4d7b3e4cbcdc9da2d2ec45c4cf4baf5ce19b283310887e87f09d0a26b6bcf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a06757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766baa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3d598776c1059c1f5c05cf74e5128f2eb8698a23c65e613458c02219a571dd8a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0c391a4626d24ecb7d811a8f34e8462bf2d65b8512426e64141d157c6e88d61c4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011eda8203e880a055fe864a62f959a039aca55b76fb939150deef55ea21b1a268f3d26772a41f3e88a77517f79e8902d1f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -155,42 +165,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "6757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766ba",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766ba",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6fcb6bfe64643afa01ff67d9275a14814bc67752f15589b00510061518aab448",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6fcb6bfe64643afa01ff67d9275a14814bc67752f15589b00510061518aab448",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fcb6bfe64643afa01ff67d9275a14814bc67752f15589b00510061518aab448a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "96a50583c6682d9e00e78dace72e167cc7f63d552e237509c782d28b79275a84",
+        "lastblockhash" : "0xdbfa14f1c2698067a79139f46151455c55af7abff1e4c1b441b0ec14ec207d77",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51eda",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3f126",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
@@ -199,32 +209,32 @@
                     "0x64" : "0x085709"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -232,36 +242,41 @@
         }
     },
     "NonZeroValue_CALLCODE_ToNonNonZeroBalance_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011c46",
-                    "hash" : "c29204bc124d47e13bca20634658663b4ded10831cc816556393ad7e5b277839",
-                    "mixHash" : "ec3220aff72f656c1fa3b35c2fef05bed2f0a8a7dc72c4d53befb2f3867267da",
-                    "nonce" : "bfabc05423afd5f7",
+                    "hash" : "0x8e7540334d769b752132683fe10cc1e67d4507847183abd54cdaaa6884ed8981",
+                    "mixHash" : "0x6fcdb3d8a2045406c253eb47141102ed86e07df46f900d0cd1af865461bd2bc1",
+                    "nonce" : "0x19f74fd5d3ef46d8",
                     "number" : "0x01",
-                    "parentHash" : "6757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766ba",
-                    "receiptTrie" : "76e68cebcc3c17dfd12d840ef44a213ba943bb36fa1d8cf4a57ecd9f215f959f",
-                    "stateRoot" : "c9b333041b8a97145b2aa4b612336ac86bb305e3f3b10eacb8920dee1bf14e16",
+                    "parentHash" : "0x6757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766ba",
+                    "receiptTrie" : "0x76e68cebcc3c17dfd12d840ef44a213ba943bb36fa1d8cf4a57ecd9f215f959f",
+                    "stateRoot" : "0xc9b333041b8a97145b2aa4b612336ac86bb305e3f3b10eacb8920dee1bf14e16",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766baa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c9b333041b8a97145b2aa4b612336ac86bb305e3f3b10eacb8920dee1bf14e16a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a076e68cebcc3c17dfd12d840ef44a213ba943bb36fa1d8cf4a57ecd9f215f959fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011c468203e880a0ec3220aff72f656c1fa3b35c2fef05bed2f0a8a7dc72c4d53befb2f3867267da88bfabc05423afd5f7f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a06757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766baa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c9b333041b8a97145b2aa4b612336ac86bb305e3f3b10eacb8920dee1bf14e16a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a076e68cebcc3c17dfd12d840ef44a213ba943bb36fa1d8cf4a57ecd9f215f959fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011c468203e880a06fcdb3d8a2045406c253eb47141102ed86e07df46f900d0cd1af865461bd2bc18819f74fd5d3ef46d8f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -271,42 +286,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "6757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766ba",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766ba",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6fcb6bfe64643afa01ff67d9275a14814bc67752f15589b00510061518aab448",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6fcb6bfe64643afa01ff67d9275a14814bc67752f15589b00510061518aab448",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fcb6bfe64643afa01ff67d9275a14814bc67752f15589b00510061518aab448a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c29204bc124d47e13bca20634658663b4ded10831cc816556393ad7e5b277839",
+        "lastblockhash" : "0x8e7540334d769b752132683fe10cc1e67d4507847183abd54cdaaa6884ed8981",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51c46",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3f3ba",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
@@ -315,32 +330,32 @@
                     "0x64" : "0x08599d"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -348,36 +363,41 @@
         }
     },
     "NonZeroValue_CALLCODE_ToNonNonZeroBalance_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011c46",
-                    "hash" : "0b7ca831a021fe306f589950446dd452fcc88b3d6db42b1a7453fdf2f571de8f",
-                    "mixHash" : "62b6e184dde90c6c5293a6c2a7d045e92afe6f9f44785b7314cae59b02241366",
-                    "nonce" : "a76ea371f760a4c0",
+                    "hash" : "0x5edbe5e115e201516c9654e7d5af3d3401972ad5a3c1d76926a6e43af58023f2",
+                    "mixHash" : "0x1c7f231944aa48eaae0f8e26517ab36cc96e3ea951863f3e78b05eea2870ac94",
+                    "nonce" : "0x90af24fe355749a9",
                     "number" : "0x01",
-                    "parentHash" : "6757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766ba",
-                    "receiptTrie" : "76e68cebcc3c17dfd12d840ef44a213ba943bb36fa1d8cf4a57ecd9f215f959f",
-                    "stateRoot" : "c9b333041b8a97145b2aa4b612336ac86bb305e3f3b10eacb8920dee1bf14e16",
+                    "parentHash" : "0x6757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766ba",
+                    "receiptTrie" : "0x76e68cebcc3c17dfd12d840ef44a213ba943bb36fa1d8cf4a57ecd9f215f959f",
+                    "stateRoot" : "0xc9b333041b8a97145b2aa4b612336ac86bb305e3f3b10eacb8920dee1bf14e16",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766baa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c9b333041b8a97145b2aa4b612336ac86bb305e3f3b10eacb8920dee1bf14e16a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a076e68cebcc3c17dfd12d840ef44a213ba943bb36fa1d8cf4a57ecd9f215f959fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011c468203e880a062b6e184dde90c6c5293a6c2a7d045e92afe6f9f44785b7314cae59b0224136688a76ea371f760a4c0f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a06757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766baa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c9b333041b8a97145b2aa4b612336ac86bb305e3f3b10eacb8920dee1bf14e16a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a076e68cebcc3c17dfd12d840ef44a213ba943bb36fa1d8cf4a57ecd9f215f959fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011c468203e880a01c7f231944aa48eaae0f8e26517ab36cc96e3ea951863f3e78b05eea2870ac948890af24fe355749a9f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -387,42 +407,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "6757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766ba",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766ba",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6fcb6bfe64643afa01ff67d9275a14814bc67752f15589b00510061518aab448",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6fcb6bfe64643afa01ff67d9275a14814bc67752f15589b00510061518aab448",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fcb6bfe64643afa01ff67d9275a14814bc67752f15589b00510061518aab448a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0b7ca831a021fe306f589950446dd452fcc88b3d6db42b1a7453fdf2f571de8f",
+        "lastblockhash" : "0x5edbe5e115e201516c9654e7d5af3d3401972ad5a3c1d76926a6e43af58023f2",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51c46",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3f3ba",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
@@ -431,32 +451,160 @@
                     "0x64" : "0x08599d"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NonZeroValue_CALLCODE_ToNonNonZeroBalance_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x011eda",
+                    "hash" : "0x7db8d9a91bcf801efef73a016d8b6a0d7610b484fd132e2e542c13804583056a",
+                    "mixHash" : "0x764d939ed1ac11b2c7a86f236d241fe7ed89cfaca2e894f07bf5618d976b4f07",
+                    "nonce" : "0x6d7d2ab24a01b81d",
+                    "number" : "0x01",
+                    "parentHash" : "0x6757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766ba",
+                    "receiptTrie" : "0xa7a411e0eb8e445042c0d9d5edcce3186e803c6459f2dde4e746a0d207962161",
+                    "stateRoot" : "0xb5318cfd6e9c44bd60ece3189daa220b4c93be8851dc4b382d61d8d8569101ca",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a06757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766baa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b5318cfd6e9c44bd60ece3189daa220b4c93be8851dc4b382d61d8d8569101caa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0a7a411e0eb8e445042c0d9d5edcce3186e803c6459f2dde4e746a0d207962161b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011eda8203e880a0764d939ed1ac11b2c7a86f236d241fe7ed89cfaca2e894f07bf5618d976b4f07886d7d2ab24a01b81df862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x6757163cd39e915442cccbc5170d3c584d1d8f432e441080bdf156380c0766ba",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6fcb6bfe64643afa01ff67d9275a14814bc67752f15589b00510061518aab448",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fcb6bfe64643afa01ff67d9275a14814bc67752f15589b00510061518aab448a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7db8d9a91bcf801efef73a016d8b6a0d7610b484fd132e2e542c13804583056a",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f51eda",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3f126",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x08d5b6",
+                    "0x64" : "0x085709"
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey_d0g0v0.json
index 9d30ec181..810d7f356 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "NonZeroValue_CALLCODE_ToOneStorageKey_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015972",
-                    "hash" : "e5e70816f9e5930457fdb5ea9806839be1d2d9aa5f9b2a977a0f36ccb73c46e3",
-                    "mixHash" : "9db53b021360919a6f374661b6277dd1438d4833dda7c5163e7a8c51a2663d54",
-                    "nonce" : "ba2b2d55c029be71",
+                    "hash" : "0x313ad212543b5f7bf47321631fbd6fca7b695675997389c35c71bf32765bf413",
+                    "mixHash" : "0xf67351c1038f7c20de4b1f3c62253ed848ee5ccecac07d7490111e19523a792f",
+                    "nonce" : "0x015ba9074472494f",
                     "number" : "0x01",
-                    "parentHash" : "0dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74",
-                    "receiptTrie" : "0ffb8f0bec890660d6a27cae90b1ed3884f582b84cb03f736fbd0636a48e7932",
-                    "stateRoot" : "b8952254d065526ed34be782e9ea6965baca60358941a5f878e7d36c2122c8de",
+                    "parentHash" : "0x0dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74",
+                    "receiptTrie" : "0x0ffb8f0bec890660d6a27cae90b1ed3884f582b84cb03f736fbd0636a48e7932",
+                    "stateRoot" : "0xb8952254d065526ed34be782e9ea6965baca60358941a5f878e7d36c2122c8de",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8952254d065526ed34be782e9ea6965baca60358941a5f878e7d36c2122c8dea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00ffb8f0bec890660d6a27cae90b1ed3884f582b84cb03f736fbd0636a48e7932b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a09db53b021360919a6f374661b6277dd1438d4833dda7c5163e7a8c51a2663d5488ba2b2d55c029be71f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a00dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8952254d065526ed34be782e9ea6965baca60358941a5f878e7d36c2122c8dea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00ffb8f0bec890660d6a27cae90b1ed3884f582b84cb03f736fbd0636a48e7932b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a0f67351c1038f7c20de4b1f3c62253ed848ee5ccecac07d7490111e19523a792f88015ba9074472494ff862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,42 +44,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "fb5834bb331c451281d667941c3cba823bcd1933164096e83938c1d1ad7f442a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfb5834bb331c451281d667941c3cba823bcd1933164096e83938c1d1ad7f442a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb5834bb331c451281d667941c3cba823bcd1933164096e83938c1d1ad7f442aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e5e70816f9e5930457fdb5ea9806839be1d2d9aa5f9b2a977a0f36ccb73c46e3",
+        "lastblockhash" : "0x313ad212543b5f7bf47321631fbd6fca7b695675997389c35c71bf32765bf413",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55972",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3b68e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
@@ -84,9 +89,9 @@
                     "0x64" : "0x081c71"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -94,23 +99,23 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -119,36 +124,41 @@
         }
     },
     "NonZeroValue_CALLCODE_ToOneStorageKey_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015972",
-                    "hash" : "e8dcf1e160b6720a2387b1203d9353e3ecc6f80ac17921097f46b9754c5d6d99",
-                    "mixHash" : "4d2acb8cfcbcd31dcebcdccdf3a971e5ec897a47316dfd81f2328788316a5d09",
-                    "nonce" : "3d684137864cf3ce",
+                    "hash" : "0x39c91a04b2445d7babc623f7e5a826faaaf3f6ce5f6efc8a278941a4303dc8e7",
+                    "mixHash" : "0x616476ebbaa542be199a37a398b03afcfe53e41603245b71c013e3f1922386d3",
+                    "nonce" : "0xde51023c3080a4c1",
                     "number" : "0x01",
-                    "parentHash" : "0dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74",
-                    "receiptTrie" : "0ffb8f0bec890660d6a27cae90b1ed3884f582b84cb03f736fbd0636a48e7932",
-                    "stateRoot" : "b8952254d065526ed34be782e9ea6965baca60358941a5f878e7d36c2122c8de",
+                    "parentHash" : "0x0dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74",
+                    "receiptTrie" : "0x0ffb8f0bec890660d6a27cae90b1ed3884f582b84cb03f736fbd0636a48e7932",
+                    "stateRoot" : "0xb8952254d065526ed34be782e9ea6965baca60358941a5f878e7d36c2122c8de",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8952254d065526ed34be782e9ea6965baca60358941a5f878e7d36c2122c8dea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00ffb8f0bec890660d6a27cae90b1ed3884f582b84cb03f736fbd0636a48e7932b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a04d2acb8cfcbcd31dcebcdccdf3a971e5ec897a47316dfd81f2328788316a5d09883d684137864cf3cef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a00dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8952254d065526ed34be782e9ea6965baca60358941a5f878e7d36c2122c8dea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00ffb8f0bec890660d6a27cae90b1ed3884f582b84cb03f736fbd0636a48e7932b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a0616476ebbaa542be199a37a398b03afcfe53e41603245b71c013e3f1922386d388de51023c3080a4c1f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -158,42 +168,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "fb5834bb331c451281d667941c3cba823bcd1933164096e83938c1d1ad7f442a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfb5834bb331c451281d667941c3cba823bcd1933164096e83938c1d1ad7f442a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb5834bb331c451281d667941c3cba823bcd1933164096e83938c1d1ad7f442aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e8dcf1e160b6720a2387b1203d9353e3ecc6f80ac17921097f46b9754c5d6d99",
+        "lastblockhash" : "0x39c91a04b2445d7babc623f7e5a826faaaf3f6ce5f6efc8a278941a4303dc8e7",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55972",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3b68e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
@@ -203,9 +213,9 @@
                     "0x64" : "0x081c71"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -213,23 +223,23 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -238,36 +248,41 @@
         }
     },
     "NonZeroValue_CALLCODE_ToOneStorageKey_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0156de",
-                    "hash" : "9abf51e8ce46e90f9578f5f330abc7f078ab321561a5c001442c19fb8b265290",
-                    "mixHash" : "048a4ee69c2c27cd4856697a30d4cc6f0189bf459d616f09119e81bc50c8e71a",
-                    "nonce" : "4d5339db8c011847",
+                    "hash" : "0x51896cac2fa5d2c607a216e1de8f5d65cacc85ef001a64d8df96e1e813eddccb",
+                    "mixHash" : "0x74bba495f3be145d8ec5b2b27a24a6d33997ef8bb86cef09f4c1cd23c34f975a",
+                    "nonce" : "0xe9b93c9c5c04ff4c",
                     "number" : "0x01",
-                    "parentHash" : "0dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74",
-                    "receiptTrie" : "3aa6133a7d1987e60ef2ddfd6ed358e9534c9d60e31caf7c8daeeb4d7b9eb040",
-                    "stateRoot" : "19e404dbd8a0f71be18de7afcf61f547376a6a4aa9c2eac61ad63bb0777f31e1",
+                    "parentHash" : "0x0dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74",
+                    "receiptTrie" : "0x3aa6133a7d1987e60ef2ddfd6ed358e9534c9d60e31caf7c8daeeb4d7b9eb040",
+                    "stateRoot" : "0x19e404dbd8a0f71be18de7afcf61f547376a6a4aa9c2eac61ad63bb0777f31e1",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa019e404dbd8a0f71be18de7afcf61f547376a6a4aa9c2eac61ad63bb0777f31e1a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a03aa6133a7d1987e60ef2ddfd6ed358e9534c9d60e31caf7c8daeeb4d7b9eb040b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a0048a4ee69c2c27cd4856697a30d4cc6f0189bf459d616f09119e81bc50c8e71a884d5339db8c011847f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a00dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa019e404dbd8a0f71be18de7afcf61f547376a6a4aa9c2eac61ad63bb0777f31e1a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a03aa6133a7d1987e60ef2ddfd6ed358e9534c9d60e31caf7c8daeeb4d7b9eb040b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a074bba495f3be145d8ec5b2b27a24a6d33997ef8bb86cef09f4c1cd23c34f975a88e9b93c9c5c04ff4cf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -277,42 +292,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "fb5834bb331c451281d667941c3cba823bcd1933164096e83938c1d1ad7f442a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfb5834bb331c451281d667941c3cba823bcd1933164096e83938c1d1ad7f442a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb5834bb331c451281d667941c3cba823bcd1933164096e83938c1d1ad7f442aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9abf51e8ce46e90f9578f5f330abc7f078ab321561a5c001442c19fb8b265290",
+        "lastblockhash" : "0x51896cac2fa5d2c607a216e1de8f5d65cacc85ef001a64d8df96e1e813eddccb",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f556de",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3b922",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
@@ -322,9 +337,9 @@
                     "0x64" : "0x081f05"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -332,23 +347,23 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -357,36 +372,41 @@
         }
     },
     "NonZeroValue_CALLCODE_ToOneStorageKey_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0156de",
-                    "hash" : "1f504a5c613bf85788f9a0c4c15286af11e3c7be4fb75add399a0d9d40effc1b",
-                    "mixHash" : "8553a3c2c55c9b3806084d31a126c532eb0505b8b6dea5dd036b5ccb5e74c05e",
-                    "nonce" : "74ab0a5967e70dc5",
+                    "hash" : "0x3ae68859653a9c6b46e6c84c1e151c9822ff7256809ad8271b0eba36126dad9a",
+                    "mixHash" : "0x49c05f060fcf9a4891491aa177b04d90e81bd7dcf2cfcbc7bd6a7f6210ba182b",
+                    "nonce" : "0x58752ee4ba4126eb",
                     "number" : "0x01",
-                    "parentHash" : "0dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74",
-                    "receiptTrie" : "3aa6133a7d1987e60ef2ddfd6ed358e9534c9d60e31caf7c8daeeb4d7b9eb040",
-                    "stateRoot" : "19e404dbd8a0f71be18de7afcf61f547376a6a4aa9c2eac61ad63bb0777f31e1",
+                    "parentHash" : "0x0dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74",
+                    "receiptTrie" : "0x3aa6133a7d1987e60ef2ddfd6ed358e9534c9d60e31caf7c8daeeb4d7b9eb040",
+                    "stateRoot" : "0x19e404dbd8a0f71be18de7afcf61f547376a6a4aa9c2eac61ad63bb0777f31e1",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa019e404dbd8a0f71be18de7afcf61f547376a6a4aa9c2eac61ad63bb0777f31e1a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a03aa6133a7d1987e60ef2ddfd6ed358e9534c9d60e31caf7c8daeeb4d7b9eb040b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a08553a3c2c55c9b3806084d31a126c532eb0505b8b6dea5dd036b5ccb5e74c05e8874ab0a5967e70dc5f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a00dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa019e404dbd8a0f71be18de7afcf61f547376a6a4aa9c2eac61ad63bb0777f31e1a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a03aa6133a7d1987e60ef2ddfd6ed358e9534c9d60e31caf7c8daeeb4d7b9eb040b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a049c05f060fcf9a4891491aa177b04d90e81bd7dcf2cfcbc7bd6a7f6210ba182b8858752ee4ba4126ebf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -396,42 +416,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "fb5834bb331c451281d667941c3cba823bcd1933164096e83938c1d1ad7f442a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfb5834bb331c451281d667941c3cba823bcd1933164096e83938c1d1ad7f442a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb5834bb331c451281d667941c3cba823bcd1933164096e83938c1d1ad7f442aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "1f504a5c613bf85788f9a0c4c15286af11e3c7be4fb75add399a0d9d40effc1b",
+        "lastblockhash" : "0x3ae68859653a9c6b46e6c84c1e151c9822ff7256809ad8271b0eba36126dad9a",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f556de",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3b922",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
@@ -441,9 +461,140 @@
                     "0x64" : "0x081f05"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x03e8",
+                "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        }
+    },
+    "NonZeroValue_CALLCODE_ToOneStorageKey_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x015972",
+                    "hash" : "0xe705ba1826103f4a24ca3289a11a678f67a40c44908d3a34b3422c2f05a9a21d",
+                    "mixHash" : "0x8206a6fbff321614fec3ebe98582cc39954877ee2cf4895974a13211b5327fc1",
+                    "nonce" : "0x0e05997f28a2dab0",
+                    "number" : "0x01",
+                    "parentHash" : "0x0dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74",
+                    "receiptTrie" : "0x540ef40122c0819161100cb02570d8bacc522b2db8c86e328ed93907dfc77546",
+                    "stateRoot" : "0x4d7b3fc1e949b55ef0a5174b0763cf87d34d0a96bb89b2f47c38fa648423af18",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a00dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04d7b3fc1e949b55ef0a5174b0763cf87d34d0a96bb89b2f47c38fa648423af18a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0540ef40122c0819161100cb02570d8bacc522b2db8c86e328ed93907dfc77546b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a08206a6fbff321614fec3ebe98582cc39954877ee2cf4895974a13211b5327fc1880e05997f28a2dab0f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x0dae3031bd772a2be42ce968cd72edf1516ca34dc5cfd732f6628eaff0543a74",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfb5834bb331c451281d667941c3cba823bcd1933164096e83938c1d1ad7f442a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb5834bb331c451281d667941c3cba823bcd1933164096e83938c1d1ad7f442aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe705ba1826103f4a24ca3289a11a678f67a40c44908d3a34b3422c2f05a9a21d",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55972",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3b68e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x03e8",
+                "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x08d5b6",
+                    "0x01" : "0x01",
+                    "0x64" : "0x081c71"
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -451,23 +602,23 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_d0g0v0.json
index ccd117f96..6a732b809 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "NonZeroValue_CALLCODE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015972",
-                    "hash" : "f153186f420a4a6eea94792281a4e708ca7e579e9a1ac62eed60f5ba1b9066db",
-                    "mixHash" : "853eee473da9243469b2b36b535ee983140fbb65da0406d0711d38d60fd5ad6b",
-                    "nonce" : "0ed94c7c8c332024",
+                    "hash" : "0xa469318c6e64dd943f9314f1fdbd9bf683b7fef81d1350a62a360abce04458c2",
+                    "mixHash" : "0x60862f9bf7484cbb8b24c991a84f0eef303a333d71a6d36743449b0bbabad51e",
+                    "nonce" : "0xe7e2195ff54c6fe5",
                     "number" : "0x01",
-                    "parentHash" : "0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
-                    "receiptTrie" : "6e589aa3d3c6f1e92d01f0827e130a69461ab987b07d8a1a02f105e9df0dd9b5",
-                    "stateRoot" : "84d3d54cd426f6d38d193549a3e87863411e6ed48e03d27b496926ca3164d838",
+                    "parentHash" : "0x0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
+                    "receiptTrie" : "0x6e589aa3d3c6f1e92d01f0827e130a69461ab987b07d8a1a02f105e9df0dd9b5",
+                    "stateRoot" : "0x84d3d54cd426f6d38d193549a3e87863411e6ed48e03d27b496926ca3164d838",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084d3d54cd426f6d38d193549a3e87863411e6ed48e03d27b496926ca3164d838a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a06e589aa3d3c6f1e92d01f0827e130a69461ab987b07d8a1a02f105e9df0dd9b5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a0853eee473da9243469b2b36b535ee983140fbb65da0406d0711d38d60fd5ad6b880ed94c7c8c332024f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a00f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084d3d54cd426f6d38d193549a3e87863411e6ed48e03d27b496926ca3164d838a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a06e589aa3d3c6f1e92d01f0827e130a69461ab987b07d8a1a02f105e9df0dd9b5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a060862f9bf7484cbb8b24c991a84f0eef303a333d71a6d36743449b0bbabad51e88e7e2195ff54c6fe5f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,42 +44,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "3c895eeb38fa8601258132246d152654a654dea4bf4f681d3b11fb31db1f63bd",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c895eeb38fa8601258132246d152654a654dea4bf4f681d3b11fb31db1f63bd",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c895eeb38fa8601258132246d152654a654dea4bf4f681d3b11fb31db1f63bda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f153186f420a4a6eea94792281a4e708ca7e579e9a1ac62eed60f5ba1b9066db",
+        "lastblockhash" : "0xa469318c6e64dd943f9314f1fdbd9bf683b7fef81d1350a62a360abce04458c2",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55972",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3b68e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
@@ -86,14 +91,14 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
@@ -103,36 +108,41 @@
         }
     },
     "NonZeroValue_CALLCODE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015972",
-                    "hash" : "4b3d64f88046bfc0d83285d5b6e4ea116f305966b888d68ac70eec99dc266226",
-                    "mixHash" : "f4d9d80474a51c7f8ea08334b814fd9c5d16dc24b207ca31ce4fd8ed689ad4fb",
-                    "nonce" : "712eb59bc44de5bd",
+                    "hash" : "0x595c02bbb88f3047650b4b75136702599c50afc9aecd086dfa7da88a5b619263",
+                    "mixHash" : "0x9967a38b9486b90d8401cc053893a0e4d25765e52a4b3927dc79744a8578185b",
+                    "nonce" : "0x944b11eea6355394",
                     "number" : "0x01",
-                    "parentHash" : "0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
-                    "receiptTrie" : "6e589aa3d3c6f1e92d01f0827e130a69461ab987b07d8a1a02f105e9df0dd9b5",
-                    "stateRoot" : "84d3d54cd426f6d38d193549a3e87863411e6ed48e03d27b496926ca3164d838",
+                    "parentHash" : "0x0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
+                    "receiptTrie" : "0x6e589aa3d3c6f1e92d01f0827e130a69461ab987b07d8a1a02f105e9df0dd9b5",
+                    "stateRoot" : "0x84d3d54cd426f6d38d193549a3e87863411e6ed48e03d27b496926ca3164d838",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084d3d54cd426f6d38d193549a3e87863411e6ed48e03d27b496926ca3164d838a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a06e589aa3d3c6f1e92d01f0827e130a69461ab987b07d8a1a02f105e9df0dd9b5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a0f4d9d80474a51c7f8ea08334b814fd9c5d16dc24b207ca31ce4fd8ed689ad4fb88712eb59bc44de5bdf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a00f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084d3d54cd426f6d38d193549a3e87863411e6ed48e03d27b496926ca3164d838a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a06e589aa3d3c6f1e92d01f0827e130a69461ab987b07d8a1a02f105e9df0dd9b5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a09967a38b9486b90d8401cc053893a0e4d25765e52a4b3927dc79744a8578185b88944b11eea6355394f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -142,42 +152,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "3c895eeb38fa8601258132246d152654a654dea4bf4f681d3b11fb31db1f63bd",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c895eeb38fa8601258132246d152654a654dea4bf4f681d3b11fb31db1f63bd",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c895eeb38fa8601258132246d152654a654dea4bf4f681d3b11fb31db1f63bda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4b3d64f88046bfc0d83285d5b6e4ea116f305966b888d68ac70eec99dc266226",
+        "lastblockhash" : "0x595c02bbb88f3047650b4b75136702599c50afc9aecd086dfa7da88a5b619263",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55972",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3b68e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
@@ -189,14 +199,14 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
@@ -206,36 +216,41 @@
         }
     },
     "NonZeroValue_CALLCODE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0156de",
-                    "hash" : "151e4b058e42685a0bae15f9e44d57fb05d4b47c7c3ef78a1be7bb8c32bb52f9",
-                    "mixHash" : "0a92551f8376b6e69befad5a81fc81db469fb12ede61a5feae0fabf6f093a9e6",
-                    "nonce" : "7ac85de86c35e711",
+                    "hash" : "0xd7e0ae63074df3a7f5012c041a37c291931378d176de7f47813a7e5957d0255b",
+                    "mixHash" : "0x6753f6549a328ad4d3318fe08c9bd1d8977b3f32645ab7f11d21fbaf7671f095",
+                    "nonce" : "0x4164b5bab36abae7",
                     "number" : "0x01",
-                    "parentHash" : "0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
-                    "receiptTrie" : "0f35941aff0bf43d184c8b43135c83e1dc1fed3ec3c98327b7b48dc0b45b43c4",
-                    "stateRoot" : "bcdfd44814da5f27dde588b34ccdd997caa1770ec1ba81361bbca4351f316fe8",
+                    "parentHash" : "0x0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
+                    "receiptTrie" : "0x0f35941aff0bf43d184c8b43135c83e1dc1fed3ec3c98327b7b48dc0b45b43c4",
+                    "stateRoot" : "0xbcdfd44814da5f27dde588b34ccdd997caa1770ec1ba81361bbca4351f316fe8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bcdfd44814da5f27dde588b34ccdd997caa1770ec1ba81361bbca4351f316fe8a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00f35941aff0bf43d184c8b43135c83e1dc1fed3ec3c98327b7b48dc0b45b43c4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a00a92551f8376b6e69befad5a81fc81db469fb12ede61a5feae0fabf6f093a9e6887ac85de86c35e711f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a00f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bcdfd44814da5f27dde588b34ccdd997caa1770ec1ba81361bbca4351f316fe8a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00f35941aff0bf43d184c8b43135c83e1dc1fed3ec3c98327b7b48dc0b45b43c4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a06753f6549a328ad4d3318fe08c9bd1d8977b3f32645ab7f11d21fbaf7671f095884164b5bab36abae7f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -245,42 +260,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "3c895eeb38fa8601258132246d152654a654dea4bf4f681d3b11fb31db1f63bd",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c895eeb38fa8601258132246d152654a654dea4bf4f681d3b11fb31db1f63bd",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c895eeb38fa8601258132246d152654a654dea4bf4f681d3b11fb31db1f63bda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "151e4b058e42685a0bae15f9e44d57fb05d4b47c7c3ef78a1be7bb8c32bb52f9",
+        "lastblockhash" : "0xd7e0ae63074df3a7f5012c041a37c291931378d176de7f47813a7e5957d0255b",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f556de",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3b922",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
@@ -292,14 +307,14 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
@@ -309,36 +324,41 @@
         }
     },
     "NonZeroValue_CALLCODE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0156de",
-                    "hash" : "858936aa8a19bcc80876d3eb7d9be8c1092910f65fcf5e447f6abb05b6a18aac",
-                    "mixHash" : "8b8a87583da42ba43d3a43288ef19680f04d935e8e07e4ed70a559ad93d032df",
-                    "nonce" : "1baa1a5bb0958b3e",
+                    "hash" : "0xbc0b570e0995f97a79951c90b56c59926cbd82720dea986a1237d9dbb971159a",
+                    "mixHash" : "0xb7e67165298e5ba9edfb22f9193bc03f9c47c46acb86a5e93cfb363bbff96343",
+                    "nonce" : "0x1b779192b0277cc8",
                     "number" : "0x01",
-                    "parentHash" : "0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
-                    "receiptTrie" : "0f35941aff0bf43d184c8b43135c83e1dc1fed3ec3c98327b7b48dc0b45b43c4",
-                    "stateRoot" : "bcdfd44814da5f27dde588b34ccdd997caa1770ec1ba81361bbca4351f316fe8",
+                    "parentHash" : "0x0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
+                    "receiptTrie" : "0x0f35941aff0bf43d184c8b43135c83e1dc1fed3ec3c98327b7b48dc0b45b43c4",
+                    "stateRoot" : "0xbcdfd44814da5f27dde588b34ccdd997caa1770ec1ba81361bbca4351f316fe8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bcdfd44814da5f27dde588b34ccdd997caa1770ec1ba81361bbca4351f316fe8a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00f35941aff0bf43d184c8b43135c83e1dc1fed3ec3c98327b7b48dc0b45b43c4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a08b8a87583da42ba43d3a43288ef19680f04d935e8e07e4ed70a559ad93d032df881baa1a5bb0958b3ef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a00f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bcdfd44814da5f27dde588b34ccdd997caa1770ec1ba81361bbca4351f316fe8a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00f35941aff0bf43d184c8b43135c83e1dc1fed3ec3c98327b7b48dc0b45b43c4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a0b7e67165298e5ba9edfb22f9193bc03f9c47c46acb86a5e93cfb363bbff96343881b779192b0277cc8f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -348,42 +368,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "3c895eeb38fa8601258132246d152654a654dea4bf4f681d3b11fb31db1f63bd",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c895eeb38fa8601258132246d152654a654dea4bf4f681d3b11fb31db1f63bd",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c895eeb38fa8601258132246d152654a654dea4bf4f681d3b11fb31db1f63bda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "858936aa8a19bcc80876d3eb7d9be8c1092910f65fcf5e447f6abb05b6a18aac",
+        "lastblockhash" : "0xbc0b570e0995f97a79951c90b56c59926cbd82720dea986a1237d9dbb971159a",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f556de",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3b922",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
@@ -395,14 +415,129 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NonZeroValue_CALLCODE_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x015972",
+                    "hash" : "0x0429b6f499a3849b164853d2050a08d0e3661c0e9d5c48914d880787005b396a",
+                    "mixHash" : "0xaebf906cd9d6a72f515962ea9cf73a42f3ea28373c49f81276bb11806b5d19ee",
+                    "nonce" : "0xdd3ad818562fed1b",
+                    "number" : "0x01",
+                    "parentHash" : "0x0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
+                    "receiptTrie" : "0x540ef40122c0819161100cb02570d8bacc522b2db8c86e328ed93907dfc77546",
+                    "stateRoot" : "0xe4dba02356ea8d88a5ad96ea4d8e18295d1c5fe93a1df6201a36f8dee3af53f1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a00f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e4dba02356ea8d88a5ad96ea4d8e18295d1c5fe93a1df6201a36f8dee3af53f1a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0540ef40122c0819161100cb02570d8bacc522b2db8c86e328ed93907dfc77546b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a0aebf906cd9d6a72f515962ea9cf73a42f3ea28373c49f81276bb11806b5d19ee88dd3ad818562fed1bf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c895eeb38fa8601258132246d152654a654dea4bf4f681d3b11fb31db1f63bd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c895eeb38fa8601258132246d152654a654dea4bf4f681d3b11fb31db1f63bda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0429b6f499a3849b164853d2050a08d0e3661c0e9d5c48914d880787005b396a",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55972",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3b68e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x08d5b6",
+                    "0x01" : "0x01",
+                    "0x64" : "0x081c71"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty_d0g0v0.json
index c27970d51..358f1d78b 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "NonZeroValue_CALL_ToEmpty_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015972",
-                    "hash" : "b2e658456140067b3a5105717187cfbb5743bf458bd5d0908aa8ae862debf81a",
-                    "mixHash" : "e4d6bfe3c4554ae7bf13dcabfa0e103d2fe14765de802a8af565263da09def51",
-                    "nonce" : "e4dedd5594eebcf1",
+                    "hash" : "0xa69d0e201542abb2ccfac8b6da4aa54c51790570bdf371b0130fee00e752b027",
+                    "mixHash" : "0x6aea8514d79befe7f7ebd830d171a3843a1e66e4a67804a35134a40c1e320245",
+                    "nonce" : "0xa9df25b196507473",
                     "number" : "0x01",
-                    "parentHash" : "4647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09",
-                    "receiptTrie" : "a8de81806bf1fa4d3095d22a2a9cf366d7a74c68c95a712d406c67dcc5c4165b",
-                    "stateRoot" : "8f291d194cb427ec22c37c73d1d54ba2057d1c300645a7b19f06e293855cfb44",
+                    "parentHash" : "0x4647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09",
+                    "receiptTrie" : "0xa8de81806bf1fa4d3095d22a2a9cf366d7a74c68c95a712d406c67dcc5c4165b",
+                    "stateRoot" : "0x8f291d194cb427ec22c37c73d1d54ba2057d1c300645a7b19f06e293855cfb44",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f291d194cb427ec22c37c73d1d54ba2057d1c300645a7b19f06e293855cfb44a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0a8de81806bf1fa4d3095d22a2a9cf366d7a74c68c95a712d406c67dcc5c4165bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a0e4d6bfe3c4554ae7bf13dcabfa0e103d2fe14765de802a8af565263da09def5188e4dedd5594eebcf1f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a04647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f291d194cb427ec22c37c73d1d54ba2057d1c300645a7b19f06e293855cfb44a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0a8de81806bf1fa4d3095d22a2a9cf366d7a74c68c95a712d406c67dcc5c4165bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a06aea8514d79befe7f7ebd830d171a3843a1e66e4a67804a35134a40c1e32024588a9df25b196507473f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,42 +44,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "4647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4c8fa24c95e254cdf7e66201e37c9fd4c29f2a7213d195f6fdf8accbe9af6bdf",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4c8fa24c95e254cdf7e66201e37c9fd4c29f2a7213d195f6fdf8accbe9af6bdf",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c8fa24c95e254cdf7e66201e37c9fd4c29f2a7213d195f6fdf8accbe9af6bdfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b2e658456140067b3a5105717187cfbb5743bf458bd5d0908aa8ae862debf81a",
+        "lastblockhash" : "0xa69d0e201542abb2ccfac8b6da4aa54c51790570bdf371b0130fee00e752b027",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55972",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3b68e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e7",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
@@ -84,32 +89,32 @@
                     "0x64" : "0x081c71"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -117,36 +122,41 @@
         }
     },
     "NonZeroValue_CALL_ToEmpty_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01bb1a",
-                    "hash" : "a606658d3d74ae9ffe46a155d5a5e5085f6077335906334e634da001143b6d88",
-                    "mixHash" : "852379e6fa73fcbd13c60d11cfe0d25c8e6db5f5a0d88339b326536add970721",
-                    "nonce" : "57077baff5fda1f7",
+                    "hash" : "0xb702e771ff3787d9235b303ac3b7839a544535ca09058772a0b9903375dd47a7",
+                    "mixHash" : "0x481c3769d3963f59742786e98836447e15af1e6f32f87e556b2213d9bf86534d",
+                    "nonce" : "0x7a858b633a27947f",
                     "number" : "0x01",
-                    "parentHash" : "4647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09",
-                    "receiptTrie" : "c4bbd6bfbb56be321ef3bf8b0b997b1acbfe0f8cf2f40fdd92e4593b2acfd5db",
-                    "stateRoot" : "f66100e7512f35824a806981cc9eca65932c6072e9c7bb2457893049e5188b45",
+                    "parentHash" : "0x4647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09",
+                    "receiptTrie" : "0xc4bbd6bfbb56be321ef3bf8b0b997b1acbfe0f8cf2f40fdd92e4593b2acfd5db",
+                    "stateRoot" : "0xf66100e7512f35824a806981cc9eca65932c6072e9c7bb2457893049e5188b45",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f66100e7512f35824a806981cc9eca65932c6072e9c7bb2457893049e5188b45a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0c4bbd6bfbb56be321ef3bf8b0b997b1acbfe0f8cf2f40fdd92e4593b2acfd5dbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301bb1a8203e880a0852379e6fa73fcbd13c60d11cfe0d25c8e6db5f5a0d88339b326536add9707218857077baff5fda1f7f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a04647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f66100e7512f35824a806981cc9eca65932c6072e9c7bb2457893049e5188b45a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0c4bbd6bfbb56be321ef3bf8b0b997b1acbfe0f8cf2f40fdd92e4593b2acfd5dbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301bb1a8203e880a0481c3769d3963f59742786e98836447e15af1e6f32f87e556b2213d9bf86534d887a858b633a27947ff862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -156,42 +166,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "4647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4c8fa24c95e254cdf7e66201e37c9fd4c29f2a7213d195f6fdf8accbe9af6bdf",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4c8fa24c95e254cdf7e66201e37c9fd4c29f2a7213d195f6fdf8accbe9af6bdf",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c8fa24c95e254cdf7e66201e37c9fd4c29f2a7213d195f6fdf8accbe9af6bdfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a606658d3d74ae9ffe46a155d5a5e5085f6077335906334e634da001143b6d88",
+        "lastblockhash" : "0xb702e771ff3787d9235b303ac3b7839a544535ca09058772a0b9903375dd47a7",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5bb1a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a354e6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e7",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
@@ -201,32 +211,32 @@
                     "0x64" : "0x07bac9"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -234,36 +244,41 @@
         }
     },
     "NonZeroValue_CALL_ToEmpty_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0156de",
-                    "hash" : "097a6dccacbd3fb09b6451a9f9f1bbec8701152242484af7111c7d07889dbe30",
-                    "mixHash" : "2e29533ed3a91ff939d6add3a8ef1a8add27be2712295315cb8038b590581792",
-                    "nonce" : "7a0bc2641a8cf071",
+                    "hash" : "0x8911f2a529621fab2d660db1dce9007de6355b42188780edd672a59a09ca36d6",
+                    "mixHash" : "0x02468cc5c9dbc82f8488c471c919445559a8528c496f93c8cddd49de88c54c01",
+                    "nonce" : "0xb6d7211a85068814",
                     "number" : "0x01",
-                    "parentHash" : "4647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09",
-                    "receiptTrie" : "adf00b4df32eac72f4f99b9a612ddce310d89f7db2371b89051b92e1c5e57281",
-                    "stateRoot" : "18df151f676d16af5e3d44ec188904fe5e3697b80eb7a2887301e77676e09ade",
+                    "parentHash" : "0x4647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09",
+                    "receiptTrie" : "0xadf00b4df32eac72f4f99b9a612ddce310d89f7db2371b89051b92e1c5e57281",
+                    "stateRoot" : "0x18df151f676d16af5e3d44ec188904fe5e3697b80eb7a2887301e77676e09ade",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018df151f676d16af5e3d44ec188904fe5e3697b80eb7a2887301e77676e09adea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0adf00b4df32eac72f4f99b9a612ddce310d89f7db2371b89051b92e1c5e57281b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a02e29533ed3a91ff939d6add3a8ef1a8add27be2712295315cb8038b590581792887a0bc2641a8cf071f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a04647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018df151f676d16af5e3d44ec188904fe5e3697b80eb7a2887301e77676e09adea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0adf00b4df32eac72f4f99b9a612ddce310d89f7db2371b89051b92e1c5e57281b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a002468cc5c9dbc82f8488c471c919445559a8528c496f93c8cddd49de88c54c0188b6d7211a85068814f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -273,42 +288,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "4647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4c8fa24c95e254cdf7e66201e37c9fd4c29f2a7213d195f6fdf8accbe9af6bdf",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4c8fa24c95e254cdf7e66201e37c9fd4c29f2a7213d195f6fdf8accbe9af6bdf",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c8fa24c95e254cdf7e66201e37c9fd4c29f2a7213d195f6fdf8accbe9af6bdfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "097a6dccacbd3fb09b6451a9f9f1bbec8701152242484af7111c7d07889dbe30",
+        "lastblockhash" : "0x8911f2a529621fab2d660db1dce9007de6355b42188780edd672a59a09ca36d6",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f556de",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3b922",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e7",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
@@ -318,32 +333,32 @@
                     "0x64" : "0x081f05"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -351,36 +366,41 @@
         }
     },
     "NonZeroValue_CALL_ToEmpty_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0156de",
-                    "hash" : "2ad5882d09c995f780367d8d022bc093df221f602fc7748aec97bd34aea9f613",
-                    "mixHash" : "e0ce3705cf92b536b5cd589edd1a99ffbdffb68e098291746009ac90a87a3e9c",
-                    "nonce" : "3cb25801b426716e",
+                    "hash" : "0x8daa1173160dc8bd44c24de8b4e7505e1c2480906bb158df154bd1f4d0aa402a",
+                    "mixHash" : "0x6193981ad91646971a2824ff90d412ed8e61978afbfa153f94b35b9dbd998c85",
+                    "nonce" : "0x20dc158e8b94ba82",
                     "number" : "0x01",
-                    "parentHash" : "4647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09",
-                    "receiptTrie" : "adf00b4df32eac72f4f99b9a612ddce310d89f7db2371b89051b92e1c5e57281",
-                    "stateRoot" : "18df151f676d16af5e3d44ec188904fe5e3697b80eb7a2887301e77676e09ade",
+                    "parentHash" : "0x4647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09",
+                    "receiptTrie" : "0xadf00b4df32eac72f4f99b9a612ddce310d89f7db2371b89051b92e1c5e57281",
+                    "stateRoot" : "0x18df151f676d16af5e3d44ec188904fe5e3697b80eb7a2887301e77676e09ade",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018df151f676d16af5e3d44ec188904fe5e3697b80eb7a2887301e77676e09adea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0adf00b4df32eac72f4f99b9a612ddce310d89f7db2371b89051b92e1c5e57281b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a0e0ce3705cf92b536b5cd589edd1a99ffbdffb68e098291746009ac90a87a3e9c883cb25801b426716ef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a04647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018df151f676d16af5e3d44ec188904fe5e3697b80eb7a2887301e77676e09adea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0adf00b4df32eac72f4f99b9a612ddce310d89f7db2371b89051b92e1c5e57281b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a06193981ad91646971a2824ff90d412ed8e61978afbfa153f94b35b9dbd998c858820dc158e8b94ba82f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -390,42 +410,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "4647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4c8fa24c95e254cdf7e66201e37c9fd4c29f2a7213d195f6fdf8accbe9af6bdf",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4c8fa24c95e254cdf7e66201e37c9fd4c29f2a7213d195f6fdf8accbe9af6bdf",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c8fa24c95e254cdf7e66201e37c9fd4c29f2a7213d195f6fdf8accbe9af6bdfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2ad5882d09c995f780367d8d022bc093df221f602fc7748aec97bd34aea9f613",
+        "lastblockhash" : "0x8daa1173160dc8bd44c24de8b4e7505e1c2480906bb158df154bd1f4d0aa402a",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f556de",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3b922",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e7",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
@@ -435,32 +455,161 @@
                     "0x64" : "0x081f05"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x03e8",
+                "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NonZeroValue_CALL_ToEmpty_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01bb1a",
+                    "hash" : "0xfcb25b728effcbb6994cb3fbe4d9200904d1af35f9c242fdb2a39085d3684c45",
+                    "mixHash" : "0xf1e1a966878e5ab8d7b314986ca8b3f3e2caa169c1472c22001802321708be67",
+                    "nonce" : "0xf2578790bd7515fe",
+                    "number" : "0x01",
+                    "parentHash" : "0x4647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09",
+                    "receiptTrie" : "0xfc65d322603aa953508aded672e4260200bd87bae4ca12dc98d30b1c47e3ffdb",
+                    "stateRoot" : "0x58f8f5570f7de9d83e07fc47d14f38af7f3a7558563ce87e40af9ce1e7276c77",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a04647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa058f8f5570f7de9d83e07fc47d14f38af7f3a7558563ce87e40af9ce1e7276c77a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0fc65d322603aa953508aded672e4260200bd87bae4ca12dc98d30b1c47e3ffdbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301bb1a8203e880a0f1e1a966878e5ab8d7b314986ca8b3f3e2caa169c1472c22001802321708be6788f2578790bd7515fef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x4647a97122b305eeebfacdf4d7be44afea1ef4f96ae3e30a478b8ff5855eaa09",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4c8fa24c95e254cdf7e66201e37c9fd4c29f2a7213d195f6fdf8accbe9af6bdf",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c8fa24c95e254cdf7e66201e37c9fd4c29f2a7213d195f6fdf8accbe9af6bdfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfcb25b728effcbb6994cb3fbe4d9200904d1af35f9c242fdb2a39085d3684c45",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5bb1a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a354e6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x03e7",
+                "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x08d5b6",
+                    "0x01" : "0x01",
+                    "0x64" : "0x07bac9"
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalance.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalance_d0g0v0.json
index 4b2678c2d..eb2b25cef 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalance.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalance_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "NonZeroValue_CALL_ToNonNonZeroBalance_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011eda",
-                    "hash" : "d1dd7ef37558ec3374b8889b4b1220348ad42b234e2b72c866f0cae8cc7818df",
-                    "mixHash" : "a75186ed72c68dd098f9b68cfc96feff357d76a311351000e3c2f2b9842c3589",
-                    "nonce" : "ea255d7e884401b1",
+                    "hash" : "0xb2905a5db7a3b50e931f24286927fb07b2dcb8620abbf7a35463d42c9a1524ec",
+                    "mixHash" : "0x1b123b7c296db1cc8ad1dc7a51e9d0fb808e053f0f0138100e61bb22ad61ec4a",
+                    "nonce" : "0xf1d09746a746e109",
                     "number" : "0x01",
-                    "parentHash" : "b933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357ba",
-                    "receiptTrie" : "0f18d8513207ad927b9641d71cd7fb8c21bf933e6f1136cb08f409dca5353409",
-                    "stateRoot" : "d5fa301ed70559e88c0355350cc4a59882477b5add72360d1cfaba77f442b4ad",
+                    "parentHash" : "0xb933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357ba",
+                    "receiptTrie" : "0x0f18d8513207ad927b9641d71cd7fb8c21bf933e6f1136cb08f409dca5353409",
+                    "stateRoot" : "0xd5fa301ed70559e88c0355350cc4a59882477b5add72360d1cfaba77f442b4ad",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0b933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357baa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5fa301ed70559e88c0355350cc4a59882477b5add72360d1cfaba77f442b4ada059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00f18d8513207ad927b9641d71cd7fb8c21bf933e6f1136cb08f409dca5353409b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011eda8203e880a0a75186ed72c68dd098f9b68cfc96feff357d76a311351000e3c2f2b9842c358988ea255d7e884401b1f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0b933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357baa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5fa301ed70559e88c0355350cc4a59882477b5add72360d1cfaba77f442b4ada059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00f18d8513207ad927b9641d71cd7fb8c21bf933e6f1136cb08f409dca5353409b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011eda8203e880a01b123b7c296db1cc8ad1dc7a51e9d0fb808e053f0f0138100e61bb22ad61ec4a88f1d09746a746e109f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,42 +44,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "b933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357ba",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357ba",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4600493f032ea4e2f447b6d2149ce13b516595c4b3fa0a74e852b2386b378775",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4600493f032ea4e2f447b6d2149ce13b516595c4b3fa0a74e852b2386b378775",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04600493f032ea4e2f447b6d2149ce13b516595c4b3fa0a74e852b2386b378775a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d1dd7ef37558ec3374b8889b4b1220348ad42b234e2b72c866f0cae8cc7818df",
+        "lastblockhash" : "0xb2905a5db7a3b50e931f24286927fb07b2dcb8620abbf7a35463d42c9a1524ec",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51eda",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3f126",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
@@ -83,32 +88,32 @@
                     "0x64" : "0x085709"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -116,36 +121,41 @@
         }
     },
     "NonZeroValue_CALL_ToNonNonZeroBalance_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011eda",
-                    "hash" : "d05c2f3aa42a997185bd816cdcaeabf16aef77db13a05512bfb4e76db34939eb",
-                    "mixHash" : "1bde13509ac8520c3d64d4d7c1991bc9956e4593e6dd10ed420ad18b48ffb8b6",
-                    "nonce" : "fccbb8e1255faf55",
+                    "hash" : "0xd32782cf305e18d41143b72932ef7fa4b9622b9339af0520fb2b7e443a43a222",
+                    "mixHash" : "0x4cf909a7c0860c657845b5023987b4101e6e709edc91d8d98e2f494a45250921",
+                    "nonce" : "0x1f18683d8542bdd2",
                     "number" : "0x01",
-                    "parentHash" : "b933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357ba",
-                    "receiptTrie" : "0f18d8513207ad927b9641d71cd7fb8c21bf933e6f1136cb08f409dca5353409",
-                    "stateRoot" : "d5fa301ed70559e88c0355350cc4a59882477b5add72360d1cfaba77f442b4ad",
+                    "parentHash" : "0xb933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357ba",
+                    "receiptTrie" : "0x0f18d8513207ad927b9641d71cd7fb8c21bf933e6f1136cb08f409dca5353409",
+                    "stateRoot" : "0xd5fa301ed70559e88c0355350cc4a59882477b5add72360d1cfaba77f442b4ad",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0b933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357baa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5fa301ed70559e88c0355350cc4a59882477b5add72360d1cfaba77f442b4ada059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00f18d8513207ad927b9641d71cd7fb8c21bf933e6f1136cb08f409dca5353409b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011eda8203e880a01bde13509ac8520c3d64d4d7c1991bc9956e4593e6dd10ed420ad18b48ffb8b688fccbb8e1255faf55f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0b933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357baa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5fa301ed70559e88c0355350cc4a59882477b5add72360d1cfaba77f442b4ada059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00f18d8513207ad927b9641d71cd7fb8c21bf933e6f1136cb08f409dca5353409b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011eda8203e880a04cf909a7c0860c657845b5023987b4101e6e709edc91d8d98e2f494a45250921881f18683d8542bdd2f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -155,42 +165,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "b933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357ba",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357ba",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4600493f032ea4e2f447b6d2149ce13b516595c4b3fa0a74e852b2386b378775",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4600493f032ea4e2f447b6d2149ce13b516595c4b3fa0a74e852b2386b378775",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04600493f032ea4e2f447b6d2149ce13b516595c4b3fa0a74e852b2386b378775a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d05c2f3aa42a997185bd816cdcaeabf16aef77db13a05512bfb4e76db34939eb",
+        "lastblockhash" : "0xd32782cf305e18d41143b72932ef7fa4b9622b9339af0520fb2b7e443a43a222",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51eda",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3f126",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
@@ -199,32 +209,32 @@
                     "0x64" : "0x085709"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -232,36 +242,41 @@
         }
     },
     "NonZeroValue_CALL_ToNonNonZeroBalance_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011c46",
-                    "hash" : "09509698400ba0e3496324e025cf69124890a8056305d14e4f7ce725773f1075",
-                    "mixHash" : "e648db7a04293eae5a238b113196570a790e5956824709a6e22c63c579818e52",
-                    "nonce" : "213e78acc3df0f6d",
+                    "hash" : "0x3d77aa6db209da23fe6daf3c8bde9ec8f21868d42b224b3d996304ffa9e9c87f",
+                    "mixHash" : "0x6c43ec5a37640df0f8da36f505b62239050c5ef66c6123810c6efde19968d0d7",
+                    "nonce" : "0x47f312469e56e98d",
                     "number" : "0x01",
-                    "parentHash" : "b933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357ba",
-                    "receiptTrie" : "e4eea7d48136f90f95304c419660a5a2c9b129ded8d758dd1f7a4382a1e61992",
-                    "stateRoot" : "53df6dcb3492c9582c37e29dbe33d2c9979480947b3265b365328a04b468f093",
+                    "parentHash" : "0xb933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357ba",
+                    "receiptTrie" : "0xe4eea7d48136f90f95304c419660a5a2c9b129ded8d758dd1f7a4382a1e61992",
+                    "stateRoot" : "0x53df6dcb3492c9582c37e29dbe33d2c9979480947b3265b365328a04b468f093",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0b933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357baa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa053df6dcb3492c9582c37e29dbe33d2c9979480947b3265b365328a04b468f093a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0e4eea7d48136f90f95304c419660a5a2c9b129ded8d758dd1f7a4382a1e61992b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011c468203e880a0e648db7a04293eae5a238b113196570a790e5956824709a6e22c63c579818e5288213e78acc3df0f6df862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0b933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357baa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa053df6dcb3492c9582c37e29dbe33d2c9979480947b3265b365328a04b468f093a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0e4eea7d48136f90f95304c419660a5a2c9b129ded8d758dd1f7a4382a1e61992b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011c468203e880a06c43ec5a37640df0f8da36f505b62239050c5ef66c6123810c6efde19968d0d78847f312469e56e98df862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -271,42 +286,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "b933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357ba",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357ba",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4600493f032ea4e2f447b6d2149ce13b516595c4b3fa0a74e852b2386b378775",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4600493f032ea4e2f447b6d2149ce13b516595c4b3fa0a74e852b2386b378775",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04600493f032ea4e2f447b6d2149ce13b516595c4b3fa0a74e852b2386b378775a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "09509698400ba0e3496324e025cf69124890a8056305d14e4f7ce725773f1075",
+        "lastblockhash" : "0x3d77aa6db209da23fe6daf3c8bde9ec8f21868d42b224b3d996304ffa9e9c87f",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51c46",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3f3ba",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
@@ -315,32 +330,32 @@
                     "0x64" : "0x08599d"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -348,36 +363,41 @@
         }
     },
     "NonZeroValue_CALL_ToNonNonZeroBalance_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011c46",
-                    "hash" : "721549d2ff37f9fecfdd18bb4597e0f380ae44c70a712d5a2ba63be43a5d235b",
-                    "mixHash" : "43e69c01a082133a298dbafa7bbe801f0945320cdd9fd15e9028d5f4cb7151c1",
-                    "nonce" : "edd596011199ed4d",
+                    "hash" : "0x6b8acc426b592d9c4b2773bb1159dc12f05e03309de6ffb81728f02ddcf50809",
+                    "mixHash" : "0x0a25156c8183b01a2b51bc218faf5fbfe6b49036be84462492cd0a5fb355c40b",
+                    "nonce" : "0x892f0425f7dd33f6",
                     "number" : "0x01",
-                    "parentHash" : "b933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357ba",
-                    "receiptTrie" : "e4eea7d48136f90f95304c419660a5a2c9b129ded8d758dd1f7a4382a1e61992",
-                    "stateRoot" : "53df6dcb3492c9582c37e29dbe33d2c9979480947b3265b365328a04b468f093",
+                    "parentHash" : "0xb933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357ba",
+                    "receiptTrie" : "0xe4eea7d48136f90f95304c419660a5a2c9b129ded8d758dd1f7a4382a1e61992",
+                    "stateRoot" : "0x53df6dcb3492c9582c37e29dbe33d2c9979480947b3265b365328a04b468f093",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0b933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357baa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa053df6dcb3492c9582c37e29dbe33d2c9979480947b3265b365328a04b468f093a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0e4eea7d48136f90f95304c419660a5a2c9b129ded8d758dd1f7a4382a1e61992b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011c468203e880a043e69c01a082133a298dbafa7bbe801f0945320cdd9fd15e9028d5f4cb7151c188edd596011199ed4df862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0b933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357baa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa053df6dcb3492c9582c37e29dbe33d2c9979480947b3265b365328a04b468f093a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0e4eea7d48136f90f95304c419660a5a2c9b129ded8d758dd1f7a4382a1e61992b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011c468203e880a00a25156c8183b01a2b51bc218faf5fbfe6b49036be84462492cd0a5fb355c40b88892f0425f7dd33f6f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -387,42 +407,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "b933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357ba",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357ba",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4600493f032ea4e2f447b6d2149ce13b516595c4b3fa0a74e852b2386b378775",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4600493f032ea4e2f447b6d2149ce13b516595c4b3fa0a74e852b2386b378775",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04600493f032ea4e2f447b6d2149ce13b516595c4b3fa0a74e852b2386b378775a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "721549d2ff37f9fecfdd18bb4597e0f380ae44c70a712d5a2ba63be43a5d235b",
+        "lastblockhash" : "0x6b8acc426b592d9c4b2773bb1159dc12f05e03309de6ffb81728f02ddcf50809",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51c46",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3f3ba",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
@@ -431,32 +451,160 @@
                     "0x64" : "0x08599d"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NonZeroValue_CALL_ToNonNonZeroBalance_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x011eda",
+                    "hash" : "0x6976c85446dbd213b2725bc2bfeb36471f489f059eb4510d3b50abe219a5caa0",
+                    "mixHash" : "0xcfa6dca3506d85d1b510cf85fd86671c0b6c2f239d69f770fa9f13a0a7c6ab6c",
+                    "nonce" : "0x2d8789ad9c776978",
+                    "number" : "0x01",
+                    "parentHash" : "0xb933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357ba",
+                    "receiptTrie" : "0xa7a411e0eb8e445042c0d9d5edcce3186e803c6459f2dde4e746a0d207962161",
+                    "stateRoot" : "0xbc4c29ebd4ae88416d83331223e79a9380c46ff178424ddb6e15322b74aa12f9",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0b933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357baa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc4c29ebd4ae88416d83331223e79a9380c46ff178424ddb6e15322b74aa12f9a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0a7a411e0eb8e445042c0d9d5edcce3186e803c6459f2dde4e746a0d207962161b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011eda8203e880a0cfa6dca3506d85d1b510cf85fd86671c0b6c2f239d69f770fa9f13a0a7c6ab6c882d8789ad9c776978f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xb933d50cadd67c59e7feb79ca2126bdda47c103b25cd19de6cf82954036357ba",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4600493f032ea4e2f447b6d2149ce13b516595c4b3fa0a74e852b2386b378775",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04600493f032ea4e2f447b6d2149ce13b516595c4b3fa0a74e852b2386b378775a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6976c85446dbd213b2725bc2bfeb36471f489f059eb4510d3b50abe219a5caa0",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f51eda",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3f126",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x08d5b6",
+                    "0x64" : "0x085709"
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey_d0g0v0.json
index af1b21c6f..27d39a19b 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "NonZeroValue_CALL_ToOneStorageKey_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015972",
-                    "hash" : "3c4e321c6ac34c250c63eb8a1654332a074e1dc7f684c97008652b5c86daad2a",
-                    "mixHash" : "7ba96fae71a3d9fc0484dc27050bf9d30235404b0e6b7958121a4b713e47dcb2",
-                    "nonce" : "832b141aa51e2471",
+                    "hash" : "0x3c4e20f1935fe7df46ed0a5a0a992040b8ea0fe6ca8ad34fa14be10ca9e9900e",
+                    "mixHash" : "0x447c57b16336e7852fe996d9b806cebbc5f6251de9771baa697ecc134c09c33b",
+                    "nonce" : "0xa384de4752e72bd4",
                     "number" : "0x01",
-                    "parentHash" : "3c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26",
-                    "receiptTrie" : "26114d3f0cd2dd3a384e665069de8fb31fc628bb5ad04a98fd6d4cac202324af",
-                    "stateRoot" : "60f750815863a6db9a8aa164eca282afc24a802cc184df0ed3ad70033d02c861",
+                    "parentHash" : "0x3c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26",
+                    "receiptTrie" : "0x26114d3f0cd2dd3a384e665069de8fb31fc628bb5ad04a98fd6d4cac202324af",
+                    "stateRoot" : "0x60f750815863a6db9a8aa164eca282afc24a802cc184df0ed3ad70033d02c861",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa060f750815863a6db9a8aa164eca282afc24a802cc184df0ed3ad70033d02c861a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a026114d3f0cd2dd3a384e665069de8fb31fc628bb5ad04a98fd6d4cac202324afb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a07ba96fae71a3d9fc0484dc27050bf9d30235404b0e6b7958121a4b713e47dcb288832b141aa51e2471f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a03c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa060f750815863a6db9a8aa164eca282afc24a802cc184df0ed3ad70033d02c861a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a026114d3f0cd2dd3a384e665069de8fb31fc628bb5ad04a98fd6d4cac202324afb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a0447c57b16336e7852fe996d9b806cebbc5f6251de9771baa697ecc134c09c33b88a384de4752e72bd4f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,42 +44,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "3c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x3c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c8a36599d6063aa02812e4fd5b6bb2d40d2a442621003775fc66266ab2f3dcbd",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc8a36599d6063aa02812e4fd5b6bb2d40d2a442621003775fc66266ab2f3dcbd",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8a36599d6063aa02812e4fd5b6bb2d40d2a442621003775fc66266ab2f3dcbda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3c4e321c6ac34c250c63eb8a1654332a074e1dc7f684c97008652b5c86daad2a",
+        "lastblockhash" : "0x3c4e20f1935fe7df46ed0a5a0a992040b8ea0fe6ca8ad34fa14be10ca9e9900e",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55972",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3b68e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e7",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
@@ -84,9 +89,9 @@
                     "0x64" : "0x081c71"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -94,23 +99,23 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -119,36 +124,41 @@
         }
     },
     "NonZeroValue_CALL_ToOneStorageKey_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01bb1a",
-                    "hash" : "a358d84907adba9706f3ae74fb31aa318428b32aa7a08e286ca56afc4578124f",
-                    "mixHash" : "07bb746ff7f8a3ca44a3372ef677f4a6b9b5a3d472abce9797e0824437032ede",
-                    "nonce" : "ffb47cb7f6195337",
+                    "hash" : "0x69329aa0006253b96cdaf47037871b58d948e22cd05f0f8f4973e455c50829e7",
+                    "mixHash" : "0xe0218bb95872bb9035912f2fcef4a3e409cb10bdae51aefe9abc577336cb4f99",
+                    "nonce" : "0xc1f14c2ab63e3913",
                     "number" : "0x01",
-                    "parentHash" : "3c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26",
-                    "receiptTrie" : "6d5db2658c9931a0f55d690473824129a8bc26fca14a4aac610a13c6efdba61e",
-                    "stateRoot" : "aae63a4e11a0a5ef9c5d266948948520a2b0cec246be44a2e33a87f57fbec9e4",
+                    "parentHash" : "0x3c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26",
+                    "receiptTrie" : "0x6d5db2658c9931a0f55d690473824129a8bc26fca14a4aac610a13c6efdba61e",
+                    "stateRoot" : "0xaae63a4e11a0a5ef9c5d266948948520a2b0cec246be44a2e33a87f57fbec9e4",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aae63a4e11a0a5ef9c5d266948948520a2b0cec246be44a2e33a87f57fbec9e4a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a06d5db2658c9931a0f55d690473824129a8bc26fca14a4aac610a13c6efdba61eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301bb1a8203e880a007bb746ff7f8a3ca44a3372ef677f4a6b9b5a3d472abce9797e0824437032ede88ffb47cb7f6195337f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a03c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aae63a4e11a0a5ef9c5d266948948520a2b0cec246be44a2e33a87f57fbec9e4a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a06d5db2658c9931a0f55d690473824129a8bc26fca14a4aac610a13c6efdba61eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301bb1a8203e880a0e0218bb95872bb9035912f2fcef4a3e409cb10bdae51aefe9abc577336cb4f9988c1f14c2ab63e3913f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -158,42 +168,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "3c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x3c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c8a36599d6063aa02812e4fd5b6bb2d40d2a442621003775fc66266ab2f3dcbd",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc8a36599d6063aa02812e4fd5b6bb2d40d2a442621003775fc66266ab2f3dcbd",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8a36599d6063aa02812e4fd5b6bb2d40d2a442621003775fc66266ab2f3dcbda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a358d84907adba9706f3ae74fb31aa318428b32aa7a08e286ca56afc4578124f",
+        "lastblockhash" : "0x69329aa0006253b96cdaf47037871b58d948e22cd05f0f8f4973e455c50829e7",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5bb1a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a354e6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e7",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
@@ -203,9 +213,9 @@
                     "0x64" : "0x07bac9"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -213,23 +223,23 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -238,36 +248,41 @@
         }
     },
     "NonZeroValue_CALL_ToOneStorageKey_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0156de",
-                    "hash" : "38bf55f4a9ae1d4c8cfeee8fc6156d7f4a6045213f389d8a0e555da772f75c7d",
-                    "mixHash" : "8d0370589d4aef8ddee82b75dd1008154db63e862041b415cbdd0df93ddd7a55",
-                    "nonce" : "efedb3d7d30a5afd",
+                    "hash" : "0xf7a46ca3544c01d8e8b00ba57a82b53327f10f79ab54def0c3c87f281f9b4479",
+                    "mixHash" : "0xbdafad6e4ecc5748ae9691fed5a041c0ae3d8be28bf1838f5f4c7b6c1b9ea085",
+                    "nonce" : "0x026430e6b675724c",
                     "number" : "0x01",
-                    "parentHash" : "3c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26",
-                    "receiptTrie" : "378df01b669ae138cfa73bb44a739bcf2cfe39016752a6cb0f0e82b4e0d2e409",
-                    "stateRoot" : "8a14152c1012826e7bb553da7e4afde9422486ee0e6fb47f4ff526926b2c646e",
+                    "parentHash" : "0x3c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26",
+                    "receiptTrie" : "0x378df01b669ae138cfa73bb44a739bcf2cfe39016752a6cb0f0e82b4e0d2e409",
+                    "stateRoot" : "0x8a14152c1012826e7bb553da7e4afde9422486ee0e6fb47f4ff526926b2c646e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a14152c1012826e7bb553da7e4afde9422486ee0e6fb47f4ff526926b2c646ea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0378df01b669ae138cfa73bb44a739bcf2cfe39016752a6cb0f0e82b4e0d2e409b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a08d0370589d4aef8ddee82b75dd1008154db63e862041b415cbdd0df93ddd7a5588efedb3d7d30a5afdf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a03c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a14152c1012826e7bb553da7e4afde9422486ee0e6fb47f4ff526926b2c646ea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0378df01b669ae138cfa73bb44a739bcf2cfe39016752a6cb0f0e82b4e0d2e409b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a0bdafad6e4ecc5748ae9691fed5a041c0ae3d8be28bf1838f5f4c7b6c1b9ea08588026430e6b675724cf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -277,42 +292,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "3c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x3c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c8a36599d6063aa02812e4fd5b6bb2d40d2a442621003775fc66266ab2f3dcbd",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc8a36599d6063aa02812e4fd5b6bb2d40d2a442621003775fc66266ab2f3dcbd",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8a36599d6063aa02812e4fd5b6bb2d40d2a442621003775fc66266ab2f3dcbda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "38bf55f4a9ae1d4c8cfeee8fc6156d7f4a6045213f389d8a0e555da772f75c7d",
+        "lastblockhash" : "0xf7a46ca3544c01d8e8b00ba57a82b53327f10f79ab54def0c3c87f281f9b4479",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f556de",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3b922",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e7",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
@@ -322,9 +337,9 @@
                     "0x64" : "0x081f05"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -332,23 +347,23 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -357,36 +372,41 @@
         }
     },
     "NonZeroValue_CALL_ToOneStorageKey_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0156de",
-                    "hash" : "255f0f291480e0d3d0eeef342a09760770b3ef028b77fac3781ac1a4fec1dbaa",
-                    "mixHash" : "a823e729d2062b8d464725b75fb6de659526279abbb4bbf7e108db28b73b3788",
-                    "nonce" : "0e6f390ac5e0b8ea",
+                    "hash" : "0x690f3c2792df25828e4daef871f6de01ce875ac9076fcda985b2a914344e8270",
+                    "mixHash" : "0x996ce1ad4809dd6d0ea551e0fcc7889fba51b0ca561edf2a8a95dd87003d4d07",
+                    "nonce" : "0x58a6c97a801af91f",
                     "number" : "0x01",
-                    "parentHash" : "3c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26",
-                    "receiptTrie" : "378df01b669ae138cfa73bb44a739bcf2cfe39016752a6cb0f0e82b4e0d2e409",
-                    "stateRoot" : "8a14152c1012826e7bb553da7e4afde9422486ee0e6fb47f4ff526926b2c646e",
+                    "parentHash" : "0x3c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26",
+                    "receiptTrie" : "0x378df01b669ae138cfa73bb44a739bcf2cfe39016752a6cb0f0e82b4e0d2e409",
+                    "stateRoot" : "0x8a14152c1012826e7bb553da7e4afde9422486ee0e6fb47f4ff526926b2c646e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a14152c1012826e7bb553da7e4afde9422486ee0e6fb47f4ff526926b2c646ea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0378df01b669ae138cfa73bb44a739bcf2cfe39016752a6cb0f0e82b4e0d2e409b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a0a823e729d2062b8d464725b75fb6de659526279abbb4bbf7e108db28b73b3788880e6f390ac5e0b8eaf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a03c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a14152c1012826e7bb553da7e4afde9422486ee0e6fb47f4ff526926b2c646ea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0378df01b669ae138cfa73bb44a739bcf2cfe39016752a6cb0f0e82b4e0d2e409b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a0996ce1ad4809dd6d0ea551e0fcc7889fba51b0ca561edf2a8a95dd87003d4d078858a6c97a801af91ff862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -396,42 +416,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "3c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x3c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c8a36599d6063aa02812e4fd5b6bb2d40d2a442621003775fc66266ab2f3dcbd",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc8a36599d6063aa02812e4fd5b6bb2d40d2a442621003775fc66266ab2f3dcbd",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8a36599d6063aa02812e4fd5b6bb2d40d2a442621003775fc66266ab2f3dcbda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "255f0f291480e0d3d0eeef342a09760770b3ef028b77fac3781ac1a4fec1dbaa",
+        "lastblockhash" : "0x690f3c2792df25828e4daef871f6de01ce875ac9076fcda985b2a914344e8270",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f556de",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3b922",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e7",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
@@ -441,9 +461,140 @@
                     "0x64" : "0x081f05"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x03e8",
+                "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        }
+    },
+    "NonZeroValue_CALL_ToOneStorageKey_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01bb1a",
+                    "hash" : "0xe542af53a5674ddffaa5887be3f5cc2cdf685f67f50275fa335706eb076d33e6",
+                    "mixHash" : "0x33a4a83d81da2c2f29a6bba09cd47338e8476926c5ed5ad82158371a424ce6df",
+                    "nonce" : "0xa2b0d191afa0a1db",
+                    "number" : "0x01",
+                    "parentHash" : "0x3c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26",
+                    "receiptTrie" : "0xfc65d322603aa953508aded672e4260200bd87bae4ca12dc98d30b1c47e3ffdb",
+                    "stateRoot" : "0x244b8c4f027fa44be57239e9afbd00ad46089540a8ef948b6a00581d9e2e988d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a03c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0244b8c4f027fa44be57239e9afbd00ad46089540a8ef948b6a00581d9e2e988da059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0fc65d322603aa953508aded672e4260200bd87bae4ca12dc98d30b1c47e3ffdbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301bb1a8203e880a033a4a83d81da2c2f29a6bba09cd47338e8476926c5ed5ad82158371a424ce6df88a2b0d191afa0a1dbf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3c157c8a0ae256990955b66d439b94f77ff0c1c733bd55b99db78894f5cdec26",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc8a36599d6063aa02812e4fd5b6bb2d40d2a442621003775fc66266ab2f3dcbd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8a36599d6063aa02812e4fd5b6bb2d40d2a442621003775fc66266ab2f3dcbda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe542af53a5674ddffaa5887be3f5cc2cdf685f67f50275fa335706eb076d33e6",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5bb1a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a354e6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x03e7",
+                "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x08d5b6",
+                    "0x01" : "0x01",
+                    "0x64" : "0x07bac9"
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -451,23 +602,23 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/CALL_OneVCallSuicide.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_d0g0v0.json
index 32c7521bb..a38a3146a 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/CALL_OneVCallSuicide.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_d0g0v0.json
@@ -1,35 +1,40 @@
 {
-    "CALL_OneVCallSuicide_d0g0v0_EIP150" : {
+    "NonZeroValue_CALL_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALL_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01bb1a",
-                    "hash" : "f694b4a66afffceec26a614aabc68faaa71c575e1a404866861c9ccc85a9e185",
-                    "mixHash" : "47d739e8578e8ce186876a95bec759610fef2447c3ba325f9998ab69a73aefb7",
-                    "nonce" : "229850f0f0131daf",
+                    "hash" : "0x9f890b9f5ffb124198247251d926f0a5e422903094c92f2f39338af8b52d2823",
+                    "mixHash" : "0x0722cc3d32c4d631866468509284b7272e7d9002c373ab39ace9070245d2ca50",
+                    "nonce" : "0x196a462022a67852",
                     "number" : "0x01",
-                    "parentHash" : "b01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6",
-                    "receiptTrie" : "b47a8744dfdf2eca7f4bb62c51d663f7d12ef97d22bd49d61f412479182fb679",
-                    "stateRoot" : "1684ae087478e217c632a7450ae51a35c98f5b1dcfce16f051e6db1df4d10cc7",
+                    "parentHash" : "0xb01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6",
+                    "receiptTrie" : "0xb47a8744dfdf2eca7f4bb62c51d663f7d12ef97d22bd49d61f412479182fb679",
+                    "stateRoot" : "0x1684ae087478e217c632a7450ae51a35c98f5b1dcfce16f051e6db1df4d10cc7",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0b01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01684ae087478e217c632a7450ae51a35c98f5b1dcfce16f051e6db1df4d10cc7a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0b47a8744dfdf2eca7f4bb62c51d663f7d12ef97d22bd49d61f412479182fb679b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301bb1a8203e880a047d739e8578e8ce186876a95bec759610fef2447c3ba325f9998ab69a73aefb788229850f0f0131daff862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0b01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01684ae087478e217c632a7450ae51a35c98f5b1dcfce16f051e6db1df4d10cc7a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0b47a8744dfdf2eca7f4bb62c51d663f7d12ef97d22bd49d61f412479182fb679b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301bb1a8203e880a00722cc3d32c4d631866468509284b7272e7d9002c373ab39ace9070245d2ca5088196a462022a67852f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,42 +44,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "b01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6d852bb4bedac233725b89fc565489ad8f449ee1d5e71997e0436b242ead6894",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6d852bb4bedac233725b89fc565489ad8f449ee1d5e71997e0436b242ead6894",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d852bb4bedac233725b89fc565489ad8f449ee1d5e71997e0436b242ead6894a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f694b4a66afffceec26a614aabc68faaa71c575e1a404866861c9ccc85a9e185",
+        "lastblockhash" : "0x9f890b9f5ffb124198247251d926f0a5e422903094c92f2f39338af8b52d2823",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5bb1a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a354e6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x63",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
@@ -84,23 +89,23 @@
                     "0x64" : "0x07bac9"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
@@ -109,37 +114,42 @@
             }
         }
     },
-    "CALL_OneVCallSuicide_d0g0v0_EIP158" : {
+    "NonZeroValue_CALL_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALL_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01bb1a",
-                    "hash" : "fc76830f5b44fd6dd6b54db9f018ff751473fdd04c152ae35cc41f1b2e09a045",
-                    "mixHash" : "2fbf92d237da3a8625bb1fed75c75fe16ea5dfedeb72192c1e75f71a11b6a7f0",
-                    "nonce" : "a4b5a5af4dc8bd98",
+                    "hash" : "0x87db4f9581ed1e24212091875fc05988f4a54ded362e9a97c19654f0f98629c2",
+                    "mixHash" : "0xd748e043eb6ae5c5aab101ab50e822c44f6d9523d03ff481c84c068f1e753c37",
+                    "nonce" : "0xbe525ce5c71795dd",
                     "number" : "0x01",
-                    "parentHash" : "b01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6",
-                    "receiptTrie" : "b47a8744dfdf2eca7f4bb62c51d663f7d12ef97d22bd49d61f412479182fb679",
-                    "stateRoot" : "1684ae087478e217c632a7450ae51a35c98f5b1dcfce16f051e6db1df4d10cc7",
+                    "parentHash" : "0xb01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6",
+                    "receiptTrie" : "0xb47a8744dfdf2eca7f4bb62c51d663f7d12ef97d22bd49d61f412479182fb679",
+                    "stateRoot" : "0x1684ae087478e217c632a7450ae51a35c98f5b1dcfce16f051e6db1df4d10cc7",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0b01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01684ae087478e217c632a7450ae51a35c98f5b1dcfce16f051e6db1df4d10cc7a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0b47a8744dfdf2eca7f4bb62c51d663f7d12ef97d22bd49d61f412479182fb679b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301bb1a8203e880a02fbf92d237da3a8625bb1fed75c75fe16ea5dfedeb72192c1e75f71a11b6a7f088a4b5a5af4dc8bd98f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0b01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01684ae087478e217c632a7450ae51a35c98f5b1dcfce16f051e6db1df4d10cc7a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0b47a8744dfdf2eca7f4bb62c51d663f7d12ef97d22bd49d61f412479182fb679b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301bb1a8203e880a0d748e043eb6ae5c5aab101ab50e822c44f6d9523d03ff481c84c068f1e753c3788be525ce5c71795ddf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -149,42 +159,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "b01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6d852bb4bedac233725b89fc565489ad8f449ee1d5e71997e0436b242ead6894",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6d852bb4bedac233725b89fc565489ad8f449ee1d5e71997e0436b242ead6894",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d852bb4bedac233725b89fc565489ad8f449ee1d5e71997e0436b242ead6894a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "fc76830f5b44fd6dd6b54db9f018ff751473fdd04c152ae35cc41f1b2e09a045",
+        "lastblockhash" : "0x87db4f9581ed1e24212091875fc05988f4a54ded362e9a97c19654f0f98629c2",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5bb1a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a354e6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x63",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
@@ -194,23 +204,23 @@
                     "0x64" : "0x07bac9"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
@@ -219,37 +229,42 @@
             }
         }
     },
-    "CALL_OneVCallSuicide_d0g0v0_Frontier" : {
+    "NonZeroValue_CALL_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALL_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01b886",
-                    "hash" : "76fff668fdf5ffd2903ab7c02f83c16f245c8f1c01a71924db4bf7162119c667",
-                    "mixHash" : "cfd0ddb6d5dcbf1115d30714555ba1fc0d0f2f71021b07b480c38eff33906403",
-                    "nonce" : "15791fa2bd402615",
+                    "hash" : "0x3489b3d32eaf1afc11cf0a07582ed0b12a501af302aa679523519879020c1f42",
+                    "mixHash" : "0xd03baa2766af2539326e3422ebbed00e7bb4e89580db78e5294060cdbb605fac",
+                    "nonce" : "0x37e1f7b391cdc9ee",
                     "number" : "0x01",
-                    "parentHash" : "b01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6",
-                    "receiptTrie" : "23a080d619f37b45543406fb18ddaf23dbb7d4ebedffd130cd570b49b8743ec1",
-                    "stateRoot" : "1283c99f422ba13d7b8e0a83716e9c890e9c69486898ce09cdf81fc34c2542dc",
+                    "parentHash" : "0xb01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6",
+                    "receiptTrie" : "0x23a080d619f37b45543406fb18ddaf23dbb7d4ebedffd130cd570b49b8743ec1",
+                    "stateRoot" : "0x1283c99f422ba13d7b8e0a83716e9c890e9c69486898ce09cdf81fc34c2542dc",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0b01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01283c99f422ba13d7b8e0a83716e9c890e9c69486898ce09cdf81fc34c2542dca059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a023a080d619f37b45543406fb18ddaf23dbb7d4ebedffd130cd570b49b8743ec1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301b8868203e880a0cfd0ddb6d5dcbf1115d30714555ba1fc0d0f2f71021b07b480c38eff339064038815791fa2bd402615f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0b01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01283c99f422ba13d7b8e0a83716e9c890e9c69486898ce09cdf81fc34c2542dca059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a023a080d619f37b45543406fb18ddaf23dbb7d4ebedffd130cd570b49b8743ec1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301b8868203e880a0d03baa2766af2539326e3422ebbed00e7bb4e89580db78e5294060cdbb605fac8837e1f7b391cdc9eef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -259,42 +274,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "b01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6d852bb4bedac233725b89fc565489ad8f449ee1d5e71997e0436b242ead6894",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6d852bb4bedac233725b89fc565489ad8f449ee1d5e71997e0436b242ead6894",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d852bb4bedac233725b89fc565489ad8f449ee1d5e71997e0436b242ead6894a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "76fff668fdf5ffd2903ab7c02f83c16f245c8f1c01a71924db4bf7162119c667",
+        "lastblockhash" : "0x3489b3d32eaf1afc11cf0a07582ed0b12a501af302aa679523519879020c1f42",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5b886",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3577a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x63",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
@@ -304,23 +319,23 @@
                     "0x64" : "0x07bd5d"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
@@ -329,37 +344,42 @@
             }
         }
     },
-    "CALL_OneVCallSuicide_d0g0v0_Homestead" : {
+    "NonZeroValue_CALL_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALL_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01b886",
-                    "hash" : "8e47c38e0b76f7975f4c2fd5a743beee3265cd5c2b22e2d3db8278357cafe550",
-                    "mixHash" : "bbbc90b6d269a717d39457138a4ef22b01cc9d43ded18d30a223eabe15224904",
-                    "nonce" : "2d95058731b8b25b",
+                    "hash" : "0x8618b525c49a3a9df602ee0e9321bbf4efbb507bc1820ce3f07e5d56e4e7af42",
+                    "mixHash" : "0xf66602a195cbdc94b86ded6dd17d205f71929c98ff3c63b5af9f678e9e420751",
+                    "nonce" : "0xeeb0a235ea3a3f61",
                     "number" : "0x01",
-                    "parentHash" : "b01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6",
-                    "receiptTrie" : "23a080d619f37b45543406fb18ddaf23dbb7d4ebedffd130cd570b49b8743ec1",
-                    "stateRoot" : "1283c99f422ba13d7b8e0a83716e9c890e9c69486898ce09cdf81fc34c2542dc",
+                    "parentHash" : "0xb01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6",
+                    "receiptTrie" : "0x23a080d619f37b45543406fb18ddaf23dbb7d4ebedffd130cd570b49b8743ec1",
+                    "stateRoot" : "0x1283c99f422ba13d7b8e0a83716e9c890e9c69486898ce09cdf81fc34c2542dc",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0b01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01283c99f422ba13d7b8e0a83716e9c890e9c69486898ce09cdf81fc34c2542dca059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a023a080d619f37b45543406fb18ddaf23dbb7d4ebedffd130cd570b49b8743ec1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301b8868203e880a0bbbc90b6d269a717d39457138a4ef22b01cc9d43ded18d30a223eabe15224904882d95058731b8b25bf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0b01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01283c99f422ba13d7b8e0a83716e9c890e9c69486898ce09cdf81fc34c2542dca059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a023a080d619f37b45543406fb18ddaf23dbb7d4ebedffd130cd570b49b8743ec1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301b8868203e880a0f66602a195cbdc94b86ded6dd17d205f71929c98ff3c63b5af9f678e9e42075188eeb0a235ea3a3f61f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -369,42 +389,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "b01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6d852bb4bedac233725b89fc565489ad8f449ee1d5e71997e0436b242ead6894",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6d852bb4bedac233725b89fc565489ad8f449ee1d5e71997e0436b242ead6894",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d852bb4bedac233725b89fc565489ad8f449ee1d5e71997e0436b242ead6894a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8e47c38e0b76f7975f4c2fd5a743beee3265cd5c2b22e2d3db8278357cafe550",
+        "lastblockhash" : "0x8618b525c49a3a9df602ee0e9321bbf4efbb507bc1820ce3f07e5d56e4e7af42",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5b886",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3577a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x63",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
@@ -414,23 +434,145 @@
                     "0x64" : "0x07bd5d"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NonZeroValue_CALL_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALL_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01bb1a",
+                    "hash" : "0xe298f9c8d0bb9ecc563c2179d5239735bcbfdc22c9f7a90b3a219fbaff54814d",
+                    "mixHash" : "0x6804b89dcd52d9ea1c2bde7375a3a865f6c6ad4e5769f4d88057db14b3a66d81",
+                    "nonce" : "0x9eef133a4d13b2b1",
+                    "number" : "0x01",
+                    "parentHash" : "0xb01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6",
+                    "receiptTrie" : "0xfc65d322603aa953508aded672e4260200bd87bae4ca12dc98d30b1c47e3ffdb",
+                    "stateRoot" : "0xf068a33babd9fbc42ecc5d37b2a222c3f4246acd4dc9c4379688b94151cf4a66",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0b01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f068a33babd9fbc42ecc5d37b2a222c3f4246acd4dc9c4379688b94151cf4a66a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0fc65d322603aa953508aded672e4260200bd87bae4ca12dc98d30b1c47e3ffdbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301bb1a8203e880a06804b89dcd52d9ea1c2bde7375a3a865f6c6ad4e5769f4d88057db14b3a66d81889eef133a4d13b2b1f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xb01274ecd1a9aa9d3dd3a018a001bb6fd52945f2f46df0e5075d062b9f5293a6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6d852bb4bedac233725b89fc565489ad8f449ee1d5e71997e0436b242ead6894",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d852bb4bedac233725b89fc565489ad8f449ee1d5e71997e0436b242ead6894a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe298f9c8d0bb9ecc563c2179d5239735bcbfdc22c9f7a90b3a219fbaff54814d",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5bb1a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a354e6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63",
+                "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x08d5b6",
+                    "0x01" : "0x01",
+                    "0x64" : "0x07bac9"
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty_d0g0v0.json
index 08ef41da3..309e14a82 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "NonZeroValue_DELEGATECALL_ToEmpty_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f43",
-                    "hash" : "e864a19a70965b461dd8f458a45b3613cdaeb7a33e9590ae74bdacc59e297387",
-                    "mixHash" : "4ae6fb729e8ea4bbc0d946361c278cd2d6dc4b5cab508cf279af880f6834df2b",
-                    "nonce" : "9f2f8076ac7cb0fb",
+                    "hash" : "0xfebac9c3c905f9ef5a93f1e64fccfa19304b83d07a14385b14ea13b423e7eed7",
+                    "mixHash" : "0x0f099b352a372ea0b4784c3f1c92c16766062b43b620c992ea6856a26d3fc65a",
+                    "nonce" : "0xc62f386d76bfb2c9",
                     "number" : "0x01",
-                    "parentHash" : "bec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198",
-                    "receiptTrie" : "27a17c8b5397de69e17b3ff611b927215be9603ed224bacfc70b0ba00f798e69",
-                    "stateRoot" : "202931127cf029cfe833aa809a5df8b4f9fbfcf0af74a13309d4a6c1799c6c91",
+                    "parentHash" : "0xbec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198",
+                    "receiptTrie" : "0x27a17c8b5397de69e17b3ff611b927215be9603ed224bacfc70b0ba00f798e69",
+                    "stateRoot" : "0x202931127cf029cfe833aa809a5df8b4f9fbfcf0af74a13309d4a6c1799c6c91",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0202931127cf029cfe833aa809a5df8b4f9fbfcf0af74a13309d4a6c1799c6c91a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a027a17c8b5397de69e17b3ff611b927215be9603ed224bacfc70b0ba00f798e69b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f438203e880a04ae6fb729e8ea4bbc0d946361c278cd2d6dc4b5cab508cf279af880f6834df2b889f2f8076ac7cb0fbf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0bec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0202931127cf029cfe833aa809a5df8b4f9fbfcf0af74a13309d4a6c1799c6c91a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a027a17c8b5397de69e17b3ff611b927215be9603ed224bacfc70b0ba00f798e69b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f438203e880a00f099b352a372ea0b4784c3f1c92c16766062b43b620c992ea6856a26d3fc65a88c62f386d76bfb2c9f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,42 +44,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "bec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xbec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "62667f8f432b50a94a336f715b784c9c94b779d7f52d0ed38c867bac8218531c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x62667f8f432b50a94a336f715b784c9c94b779d7f52d0ed38c867bac8218531c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062667f8f432b50a94a336f715b784c9c94b779d7f52d0ed38c867bac8218531ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e864a19a70965b461dd8f458a45b3613cdaeb7a33e9590ae74bdacc59e297387",
+        "lastblockhash" : "0xfebac9c3c905f9ef5a93f1e64fccfa19304b83d07a14385b14ea13b423e7eed7",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53f43",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3d0bd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
@@ -84,32 +89,32 @@
                     "0x64" : "0x0836a0"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -117,36 +122,41 @@
         }
     },
     "NonZeroValue_DELEGATECALL_ToEmpty_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f43",
-                    "hash" : "127676c158697b6bc5d0d99554bbf753797602cdf033ae7d8303bb26f97f4993",
-                    "mixHash" : "a6bd68561215435f39e3ed69dbf1925b9496b48c6ddc572317c75da9b69bb54a",
-                    "nonce" : "f701b3ffe712dded",
+                    "hash" : "0x33d28f3d818e98c5a26cdea365251a7b93eeb036e84452f953385e046c69f4c8",
+                    "mixHash" : "0x9c93839b4349ad35c57c38249e32a3dd4a8cb8aebd940693172b7d214371b59a",
+                    "nonce" : "0xd1c7b288acf7d65e",
                     "number" : "0x01",
-                    "parentHash" : "bec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198",
-                    "receiptTrie" : "27a17c8b5397de69e17b3ff611b927215be9603ed224bacfc70b0ba00f798e69",
-                    "stateRoot" : "202931127cf029cfe833aa809a5df8b4f9fbfcf0af74a13309d4a6c1799c6c91",
+                    "parentHash" : "0xbec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198",
+                    "receiptTrie" : "0x27a17c8b5397de69e17b3ff611b927215be9603ed224bacfc70b0ba00f798e69",
+                    "stateRoot" : "0x202931127cf029cfe833aa809a5df8b4f9fbfcf0af74a13309d4a6c1799c6c91",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0202931127cf029cfe833aa809a5df8b4f9fbfcf0af74a13309d4a6c1799c6c91a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a027a17c8b5397de69e17b3ff611b927215be9603ed224bacfc70b0ba00f798e69b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f438203e880a0a6bd68561215435f39e3ed69dbf1925b9496b48c6ddc572317c75da9b69bb54a88f701b3ffe712ddedf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0bec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0202931127cf029cfe833aa809a5df8b4f9fbfcf0af74a13309d4a6c1799c6c91a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a027a17c8b5397de69e17b3ff611b927215be9603ed224bacfc70b0ba00f798e69b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f438203e880a09c93839b4349ad35c57c38249e32a3dd4a8cb8aebd940693172b7d214371b59a88d1c7b288acf7d65ef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -156,42 +166,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "bec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xbec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "62667f8f432b50a94a336f715b784c9c94b779d7f52d0ed38c867bac8218531c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x62667f8f432b50a94a336f715b784c9c94b779d7f52d0ed38c867bac8218531c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062667f8f432b50a94a336f715b784c9c94b779d7f52d0ed38c867bac8218531ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "127676c158697b6bc5d0d99554bbf753797602cdf033ae7d8303bb26f97f4993",
+        "lastblockhash" : "0x33d28f3d818e98c5a26cdea365251a7b93eeb036e84452f953385e046c69f4c8",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53f43",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3d0bd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
@@ -201,32 +211,32 @@
                     "0x64" : "0x0836a0"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -234,36 +244,41 @@
         }
     },
     "NonZeroValue_DELEGATECALL_ToEmpty_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0927c0",
-                    "hash" : "483503b958df0ebd6779866bfb72e245f614a33f9daf11a88257f77dc935a023",
-                    "mixHash" : "85afddfb1b9f4df5bd625706961f12730a18b5b50ea6564c38a16a5b1fb24ac4",
-                    "nonce" : "9bb7bb9ae0e74f40",
+                    "hash" : "0x7cfd3526ae269af9128841d6238fe26b887a90c2ae8a7e1bb30732782e7b67a5",
+                    "mixHash" : "0x3455de57d20260922efb8c8bc44c386e3a355c781e186f62210f1e0ffa7649a0",
+                    "nonce" : "0x571edfbfb0e9ad68",
                     "number" : "0x01",
-                    "parentHash" : "bec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198",
-                    "receiptTrie" : "9192e442950b6bd8e9e1458337a56c5aef4744f54f9c7ec2490d61c13aec0418",
-                    "stateRoot" : "3d75e9435b0a1ffd6be9f1a2d8c1fb9087e26f840ec08132f445fb956e00d9f5",
+                    "parentHash" : "0xbec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198",
+                    "receiptTrie" : "0x9192e442950b6bd8e9e1458337a56c5aef4744f54f9c7ec2490d61c13aec0418",
+                    "stateRoot" : "0x3d75e9435b0a1ffd6be9f1a2d8c1fb9087e26f840ec08132f445fb956e00d9f5",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d75e9435b0a1ffd6be9f1a2d8c1fb9087e26f840ec08132f445fb956e00d9f5a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a09192e442950b6bd8e9e1458337a56c5aef4744f54f9c7ec2490d61c13aec0418b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a085afddfb1b9f4df5bd625706961f12730a18b5b50ea6564c38a16a5b1fb24ac4889bb7bb9ae0e74f40f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0bec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d75e9435b0a1ffd6be9f1a2d8c1fb9087e26f840ec08132f445fb956e00d9f5a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a09192e442950b6bd8e9e1458337a56c5aef4744f54f9c7ec2490d61c13aec0418b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a03455de57d20260922efb8c8bc44c386e3a355c781e186f62210f1e0ffa7649a088571edfbfb0e9ad68f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -273,74 +288,74 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "bec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xbec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "62667f8f432b50a94a336f715b784c9c94b779d7f52d0ed38c867bac8218531c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x62667f8f432b50a94a336f715b784c9c94b779d7f52d0ed38c867bac8218531c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062667f8f432b50a94a336f715b784c9c94b779d7f52d0ed38c867bac8218531ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "483503b958df0ebd6779866bfb72e245f614a33f9daf11a88257f77dc935a023",
+        "lastblockhash" : "0x7cfd3526ae269af9128841d6238fe26b887a90c2ae8a7e1bb30732782e7b67a5",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fd27c0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d49be840",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -348,36 +363,41 @@
         }
     },
     "NonZeroValue_DELEGATECALL_ToEmpty_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013caf",
-                    "hash" : "75729f253be62d0e95b7d61e7e69cd557d5d8970f5509f48b2a1177cd54d9320",
-                    "mixHash" : "4a78b11fb430c11ccaad0eaa1b753b1c53adc30e3e4f241624240f38f9f0735d",
-                    "nonce" : "99698ef18ad32d9d",
+                    "hash" : "0x2af933881e934c9109571041ac56cf2f38a136f4edb485614bd5ca7952d2352a",
+                    "mixHash" : "0x96351f898cc9ce2fcdb469b9a3a31023bd2ac4298e6b729338f393e9684f7ae2",
+                    "nonce" : "0x046761ea5df4f1e5",
                     "number" : "0x01",
-                    "parentHash" : "bec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198",
-                    "receiptTrie" : "ec93e2e32b33ea7a37987c15120d2b01d22a7d31799a077b7a24ba6604baaff7",
-                    "stateRoot" : "f84ce4a87c146e68bd1463b57f6b8bf2e9e8873088d5c31cb89b554b7dfaf6d6",
+                    "parentHash" : "0xbec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198",
+                    "receiptTrie" : "0xec93e2e32b33ea7a37987c15120d2b01d22a7d31799a077b7a24ba6604baaff7",
+                    "stateRoot" : "0xf84ce4a87c146e68bd1463b57f6b8bf2e9e8873088d5c31cb89b554b7dfaf6d6",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f84ce4a87c146e68bd1463b57f6b8bf2e9e8873088d5c31cb89b554b7dfaf6d6a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0ec93e2e32b33ea7a37987c15120d2b01d22a7d31799a077b7a24ba6604baaff7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013caf8203e880a04a78b11fb430c11ccaad0eaa1b753b1c53adc30e3e4f241624240f38f9f0735d8899698ef18ad32d9df862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0bec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f84ce4a87c146e68bd1463b57f6b8bf2e9e8873088d5c31cb89b554b7dfaf6d6a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0ec93e2e32b33ea7a37987c15120d2b01d22a7d31799a077b7a24ba6604baaff7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013caf8203e880a096351f898cc9ce2fcdb469b9a3a31023bd2ac4298e6b729338f393e9684f7ae288046761ea5df4f1e5f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -387,42 +407,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "bec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xbec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "62667f8f432b50a94a336f715b784c9c94b779d7f52d0ed38c867bac8218531c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x62667f8f432b50a94a336f715b784c9c94b779d7f52d0ed38c867bac8218531c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062667f8f432b50a94a336f715b784c9c94b779d7f52d0ed38c867bac8218531ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "75729f253be62d0e95b7d61e7e69cd557d5d8970f5509f48b2a1177cd54d9320",
+        "lastblockhash" : "0x2af933881e934c9109571041ac56cf2f38a136f4edb485614bd5ca7952d2352a",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53caf",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3d351",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
@@ -432,32 +452,161 @@
                     "0x64" : "0x083934"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NonZeroValue_DELEGATECALL_ToEmpty_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x013f43",
+                    "hash" : "0xe956ec6f05b2782974cd04b0fbcb5f7cd7d1c0484552a9bdf174fed489e7438e",
+                    "mixHash" : "0x1acb9fe032f65ebf14387c3188161149d27ed85ed6e8ec8b5b8c8475527fb593",
+                    "nonce" : "0xc916b285fb4c4068",
+                    "number" : "0x01",
+                    "parentHash" : "0xbec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198",
+                    "receiptTrie" : "0x654f8c8618590326de669ae3486fa496a62382ec27a26fe826143a927be82746",
+                    "stateRoot" : "0x3c9f5f7afa376b083667ddea3bdfa475908167b916c024727dee34edeb015183",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0bec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c9f5f7afa376b083667ddea3bdfa475908167b916c024727dee34edeb015183a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0654f8c8618590326de669ae3486fa496a62382ec27a26fe826143a927be82746b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f438203e880a01acb9fe032f65ebf14387c3188161149d27ed85ed6e8ec8b5b8c8475527fb59388c916b285fb4c4068f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xbec63f796dd7a23bb29947d1005ae4598c07d0f5eb480eb585a1e9d9b0733198",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x62667f8f432b50a94a336f715b784c9c94b779d7f52d0ed38c867bac8218531c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062667f8f432b50a94a336f715b784c9c94b779d7f52d0ed38c867bac8218531ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe956ec6f05b2782974cd04b0fbcb5f7cd7d1c0484552a9bdf174fed489e7438e",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f53f43",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3d0bd",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x08d5b6",
+                    "0x01" : "0x01",
+                    "0x64" : "0x0836a0"
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalance.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalance_d0g0v0.json
index 372ae9e71..e6cca1f53 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalance.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalance_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "NonZeroValue_DELEGATECALL_ToNonNonZeroBalance_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f43",
-                    "hash" : "71f555f0c6c5bbf9a69fb057c4f7cf97e23f713d3fc607a784b9822ea9841d90",
-                    "mixHash" : "9248f6a6d3e850c5d90743c444a2bd856b3d949f2ee0274e88e5c740a538bafa",
-                    "nonce" : "703e3d419e717e55",
+                    "hash" : "0x7a4225c3db8cc7c1c21ac57cbdad81d6a5aad9383bfb5da831a402670aa90351",
+                    "mixHash" : "0xcb6becb05c05670dcd9be9a3869d8781c51e2f82ab52be898042be74292db8d6",
+                    "nonce" : "0x7a32bb7add4c5538",
                     "number" : "0x01",
-                    "parentHash" : "87a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8c",
-                    "receiptTrie" : "ed337d222cd41952849a9d7761276cbaa4ef7976dbc226a859707195bc2dbeab",
-                    "stateRoot" : "2dbb206021e49132ec83b96be880921358d9e9083d5339913fac6d902e2bc9f4",
+                    "parentHash" : "0x87a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8c",
+                    "receiptTrie" : "0xed337d222cd41952849a9d7761276cbaa4ef7976dbc226a859707195bc2dbeab",
+                    "stateRoot" : "0x2dbb206021e49132ec83b96be880921358d9e9083d5339913fac6d902e2bc9f4",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a087a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02dbb206021e49132ec83b96be880921358d9e9083d5339913fac6d902e2bc9f4a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0ed337d222cd41952849a9d7761276cbaa4ef7976dbc226a859707195bc2dbeabb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f438203e880a09248f6a6d3e850c5d90743c444a2bd856b3d949f2ee0274e88e5c740a538bafa88703e3d419e717e55f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a087a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02dbb206021e49132ec83b96be880921358d9e9083d5339913fac6d902e2bc9f4a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0ed337d222cd41952849a9d7761276cbaa4ef7976dbc226a859707195bc2dbeabb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f438203e880a0cb6becb05c05670dcd9be9a3869d8781c51e2f82ab52be898042be74292db8d6887a32bb7add4c5538f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,42 +44,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "87a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x87a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4022f746da318984fe073e69c9acbf9950a95e0ee5849dc5c0da22f2c6132a7b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4022f746da318984fe073e69c9acbf9950a95e0ee5849dc5c0da22f2c6132a7b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04022f746da318984fe073e69c9acbf9950a95e0ee5849dc5c0da22f2c6132a7ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "71f555f0c6c5bbf9a69fb057c4f7cf97e23f713d3fc607a784b9822ea9841d90",
+        "lastblockhash" : "0x7a4225c3db8cc7c1c21ac57cbdad81d6a5aad9383bfb5da831a402670aa90351",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53f43",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3d0bd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
@@ -84,32 +89,32 @@
                     "0x64" : "0x0836a0"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -117,36 +122,41 @@
         }
     },
     "NonZeroValue_DELEGATECALL_ToNonNonZeroBalance_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f43",
-                    "hash" : "3443bd8763d9288600d5c31894ebe160f4a559263b92747e0d41a479475b3e64",
-                    "mixHash" : "6aafbe954781d923352abe532968cb78daa87404db0d299a998fff579eac1439",
-                    "nonce" : "40cc527025bbf4a7",
+                    "hash" : "0x2192f9bf619d9fdb49435b85f720b094694ffda25b4c4c1d9a53636bcfe7a85d",
+                    "mixHash" : "0xe4a2621e2c2c1bd0e64e63f21f780b8d5977cd689029fcda43751699f2742ed9",
+                    "nonce" : "0xdbf05f090b336760",
                     "number" : "0x01",
-                    "parentHash" : "87a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8c",
-                    "receiptTrie" : "ed337d222cd41952849a9d7761276cbaa4ef7976dbc226a859707195bc2dbeab",
-                    "stateRoot" : "2dbb206021e49132ec83b96be880921358d9e9083d5339913fac6d902e2bc9f4",
+                    "parentHash" : "0x87a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8c",
+                    "receiptTrie" : "0xed337d222cd41952849a9d7761276cbaa4ef7976dbc226a859707195bc2dbeab",
+                    "stateRoot" : "0x2dbb206021e49132ec83b96be880921358d9e9083d5339913fac6d902e2bc9f4",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a087a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02dbb206021e49132ec83b96be880921358d9e9083d5339913fac6d902e2bc9f4a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0ed337d222cd41952849a9d7761276cbaa4ef7976dbc226a859707195bc2dbeabb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f438203e880a06aafbe954781d923352abe532968cb78daa87404db0d299a998fff579eac14398840cc527025bbf4a7f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a087a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02dbb206021e49132ec83b96be880921358d9e9083d5339913fac6d902e2bc9f4a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0ed337d222cd41952849a9d7761276cbaa4ef7976dbc226a859707195bc2dbeabb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f438203e880a0e4a2621e2c2c1bd0e64e63f21f780b8d5977cd689029fcda43751699f2742ed988dbf05f090b336760f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -156,42 +166,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "87a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x87a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4022f746da318984fe073e69c9acbf9950a95e0ee5849dc5c0da22f2c6132a7b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4022f746da318984fe073e69c9acbf9950a95e0ee5849dc5c0da22f2c6132a7b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04022f746da318984fe073e69c9acbf9950a95e0ee5849dc5c0da22f2c6132a7ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3443bd8763d9288600d5c31894ebe160f4a559263b92747e0d41a479475b3e64",
+        "lastblockhash" : "0x2192f9bf619d9fdb49435b85f720b094694ffda25b4c4c1d9a53636bcfe7a85d",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53f43",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3d0bd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
@@ -201,32 +211,32 @@
                     "0x64" : "0x0836a0"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -234,36 +244,41 @@
         }
     },
     "NonZeroValue_DELEGATECALL_ToNonNonZeroBalance_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0927c0",
-                    "hash" : "08b514f2e54115b7c36a5f57ee8e64ed29d56464fd5055799049ae6c8f5d23ae",
-                    "mixHash" : "475842012fd7bbf970c1743bb9ff84d45414026faacdb8a9a11227dbeae33645",
-                    "nonce" : "7384796b711a954f",
+                    "hash" : "0x75c976ce497eb3a6ea251d775ab8c72318c373ae58f9f90353edf5fe970d4b93",
+                    "mixHash" : "0x4d444ff358aa57f86dfb20ba6a5ad0b953f5c19c26d91b4efa69c34abc84f600",
+                    "nonce" : "0x8e60bc34d90aea8b",
                     "number" : "0x01",
-                    "parentHash" : "87a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8c",
-                    "receiptTrie" : "55986543422586be8903be38f44e50f3bc971b79d47c6e3c4ece01d518e9c72c",
-                    "stateRoot" : "7c1fed4f231ffa0b894bceb0aee5bec9f923fa3d9f4ca6d1678c4e44d6f63d42",
+                    "parentHash" : "0x87a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8c",
+                    "receiptTrie" : "0x55986543422586be8903be38f44e50f3bc971b79d47c6e3c4ece01d518e9c72c",
+                    "stateRoot" : "0x7c1fed4f231ffa0b894bceb0aee5bec9f923fa3d9f4ca6d1678c4e44d6f63d42",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a087a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c1fed4f231ffa0b894bceb0aee5bec9f923fa3d9f4ca6d1678c4e44d6f63d42a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a055986543422586be8903be38f44e50f3bc971b79d47c6e3c4ece01d518e9c72cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a0475842012fd7bbf970c1743bb9ff84d45414026faacdb8a9a11227dbeae33645887384796b711a954ff862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a087a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c1fed4f231ffa0b894bceb0aee5bec9f923fa3d9f4ca6d1678c4e44d6f63d42a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a055986543422586be8903be38f44e50f3bc971b79d47c6e3c4ece01d518e9c72cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a04d444ff358aa57f86dfb20ba6a5ad0b953f5c19c26d91b4efa69c34abc84f600888e60bc34d90aea8bf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -273,74 +288,74 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "87a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x87a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4022f746da318984fe073e69c9acbf9950a95e0ee5849dc5c0da22f2c6132a7b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4022f746da318984fe073e69c9acbf9950a95e0ee5849dc5c0da22f2c6132a7b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04022f746da318984fe073e69c9acbf9950a95e0ee5849dc5c0da22f2c6132a7ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "08b514f2e54115b7c36a5f57ee8e64ed29d56464fd5055799049ae6c8f5d23ae",
+        "lastblockhash" : "0x75c976ce497eb3a6ea251d775ab8c72318c373ae58f9f90353edf5fe970d4b93",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fd27c0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d49be840",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -348,36 +363,41 @@
         }
     },
     "NonZeroValue_DELEGATECALL_ToNonNonZeroBalance_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013caf",
-                    "hash" : "f2f35cd3aff7940f07ee40079b1007f3f3a9c60b8be48a0858360bc3aecdf59c",
-                    "mixHash" : "ebff3cef9bba548de7a70babddfc0231c02ec588dad5996ce0e34d1ab8757bb9",
-                    "nonce" : "ba6833aaf8c95190",
+                    "hash" : "0xac145cb52f661f2fbda385fb2907aedfc6b1cd30ae86bc1d9bbb4d273185b623",
+                    "mixHash" : "0x9b413d9fc1d9742ec8814ff309e0507049b13c7f61394c716d17b0baac16e1f5",
+                    "nonce" : "0x461a375cd0a4249f",
                     "number" : "0x01",
-                    "parentHash" : "87a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8c",
-                    "receiptTrie" : "4a2137e3f81023d6c88fa1584425c1202ebf4ec5e226fda1c1fa0508457790f8",
-                    "stateRoot" : "4329f0239142399dd505addb3d76306f6d56c52255bf7eed5973269df6ffa693",
+                    "parentHash" : "0x87a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8c",
+                    "receiptTrie" : "0x4a2137e3f81023d6c88fa1584425c1202ebf4ec5e226fda1c1fa0508457790f8",
+                    "stateRoot" : "0x4329f0239142399dd505addb3d76306f6d56c52255bf7eed5973269df6ffa693",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a087a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04329f0239142399dd505addb3d76306f6d56c52255bf7eed5973269df6ffa693a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a04a2137e3f81023d6c88fa1584425c1202ebf4ec5e226fda1c1fa0508457790f8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013caf8203e880a0ebff3cef9bba548de7a70babddfc0231c02ec588dad5996ce0e34d1ab8757bb988ba6833aaf8c95190f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a087a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04329f0239142399dd505addb3d76306f6d56c52255bf7eed5973269df6ffa693a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a04a2137e3f81023d6c88fa1584425c1202ebf4ec5e226fda1c1fa0508457790f8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013caf8203e880a09b413d9fc1d9742ec8814ff309e0507049b13c7f61394c716d17b0baac16e1f588461a375cd0a4249ff862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -387,42 +407,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "87a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x87a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4022f746da318984fe073e69c9acbf9950a95e0ee5849dc5c0da22f2c6132a7b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4022f746da318984fe073e69c9acbf9950a95e0ee5849dc5c0da22f2c6132a7b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04022f746da318984fe073e69c9acbf9950a95e0ee5849dc5c0da22f2c6132a7ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f2f35cd3aff7940f07ee40079b1007f3f3a9c60b8be48a0858360bc3aecdf59c",
+        "lastblockhash" : "0xac145cb52f661f2fbda385fb2907aedfc6b1cd30ae86bc1d9bbb4d273185b623",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53caf",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3d351",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
@@ -432,32 +452,161 @@
                     "0x64" : "0x083934"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NonZeroValue_DELEGATECALL_ToNonNonZeroBalance_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x013f43",
+                    "hash" : "0x93c406a449d6b1a5625da7dc92e7882843539b51e39487b12ab797b82f25e189",
+                    "mixHash" : "0x1a99089bb77f767a81c00dbe4f141b46be470774ed12b2488ce5bea08bd302e7",
+                    "nonce" : "0x9c2ae97c34a130bf",
+                    "number" : "0x01",
+                    "parentHash" : "0x87a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8c",
+                    "receiptTrie" : "0x654f8c8618590326de669ae3486fa496a62382ec27a26fe826143a927be82746",
+                    "stateRoot" : "0x52573bc5cf9802d022db2acb29fabacdfbba7672116c99403d60d8a6067efef3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a087a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa052573bc5cf9802d022db2acb29fabacdfbba7672116c99403d60d8a6067efef3a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0654f8c8618590326de669ae3486fa496a62382ec27a26fe826143a927be82746b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f438203e880a01a99089bb77f767a81c00dbe4f141b46be470774ed12b2488ce5bea08bd302e7889c2ae97c34a130bff862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x87a6e40ca52f4140630f77d5dbfa6cd4d35636f1da2e1faf301564c49c854b8c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4022f746da318984fe073e69c9acbf9950a95e0ee5849dc5c0da22f2c6132a7b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04022f746da318984fe073e69c9acbf9950a95e0ee5849dc5c0da22f2c6132a7ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x93c406a449d6b1a5625da7dc92e7882843539b51e39487b12ab797b82f25e189",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f53f43",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3d0bd",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x08d5b6",
+                    "0x01" : "0x01",
+                    "0x64" : "0x0836a0"
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey_d0g0v0.json
index 5a0befa5b..20cca2e0a 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "NonZeroValue_DELEGATECALL_ToOneStorageKey_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f43",
-                    "hash" : "3d12ce370bccbabe2981910a2d2db8371d0cdf6c796d63083038924832115131",
-                    "mixHash" : "1c0dd35f306d2ecfa75f2b28c8ab43e4a19b74d65359968439427242c5c18d6d",
-                    "nonce" : "80e17273755eddc3",
+                    "hash" : "0x6fda606d9f3843a54358b38a39b0e23b4981d01fd4d681c65ed333ad8e39c8b5",
+                    "mixHash" : "0x5c63d6f9b59131c1421916ddd74cf7c31c6508248ae13042b68991acdb86602b",
+                    "nonce" : "0x74d5b36f7b07a703",
                     "number" : "0x01",
-                    "parentHash" : "50fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620",
-                    "receiptTrie" : "36b147e5c1d07185b682330c1a071a6e7701cadff7344d02e66d5e8f7c854e18",
-                    "stateRoot" : "3887e5d650905a8d9f2d3452d8306721fdc81006693b7b6595dc9d116cf5c32f",
+                    "parentHash" : "0x50fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620",
+                    "receiptTrie" : "0x36b147e5c1d07185b682330c1a071a6e7701cadff7344d02e66d5e8f7c854e18",
+                    "stateRoot" : "0x3887e5d650905a8d9f2d3452d8306721fdc81006693b7b6595dc9d116cf5c32f",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a050fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03887e5d650905a8d9f2d3452d8306721fdc81006693b7b6595dc9d116cf5c32fa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a036b147e5c1d07185b682330c1a071a6e7701cadff7344d02e66d5e8f7c854e18b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f438203e880a01c0dd35f306d2ecfa75f2b28c8ab43e4a19b74d65359968439427242c5c18d6d8880e17273755eddc3f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a050fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03887e5d650905a8d9f2d3452d8306721fdc81006693b7b6595dc9d116cf5c32fa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a036b147e5c1d07185b682330c1a071a6e7701cadff7344d02e66d5e8f7c854e18b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f438203e880a05c63d6f9b59131c1421916ddd74cf7c31c6508248ae13042b68991acdb86602b8874d5b36f7b07a703f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,42 +44,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "50fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x50fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "274a6f813a18eb6c739755c0acdbb61ea4108fef09c4c1f8f23941853824aea4",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x274a6f813a18eb6c739755c0acdbb61ea4108fef09c4c1f8f23941853824aea4",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0274a6f813a18eb6c739755c0acdbb61ea4108fef09c4c1f8f23941853824aea4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3d12ce370bccbabe2981910a2d2db8371d0cdf6c796d63083038924832115131",
+        "lastblockhash" : "0x6fda606d9f3843a54358b38a39b0e23b4981d01fd4d681c65ed333ad8e39c8b5",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53f43",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3d0bd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
@@ -84,9 +89,9 @@
                     "0x64" : "0x0836a0"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -94,23 +99,23 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -119,36 +124,41 @@
         }
     },
     "NonZeroValue_DELEGATECALL_ToOneStorageKey_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f43",
-                    "hash" : "88770464662a23cbd36809534b9e21d9750fa65b0a91361cfa0625b1a2d4f02b",
-                    "mixHash" : "320c115c93f93985313799d4cf3b8e4911f5372d3f6a47a1bb68fe79a4896392",
-                    "nonce" : "0e17447c57244456",
+                    "hash" : "0x35f6995d8ca7e39264ca0f8c62f38f37ca5f3bbeb4065c8ae2cf39bcc1946415",
+                    "mixHash" : "0xaa593e522889aa037da830ec8968456cda2cfb6ab65b4ab4a50dd636c53d5aa0",
+                    "nonce" : "0xd08478bf25808464",
                     "number" : "0x01",
-                    "parentHash" : "50fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620",
-                    "receiptTrie" : "36b147e5c1d07185b682330c1a071a6e7701cadff7344d02e66d5e8f7c854e18",
-                    "stateRoot" : "3887e5d650905a8d9f2d3452d8306721fdc81006693b7b6595dc9d116cf5c32f",
+                    "parentHash" : "0x50fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620",
+                    "receiptTrie" : "0x36b147e5c1d07185b682330c1a071a6e7701cadff7344d02e66d5e8f7c854e18",
+                    "stateRoot" : "0x3887e5d650905a8d9f2d3452d8306721fdc81006693b7b6595dc9d116cf5c32f",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a050fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03887e5d650905a8d9f2d3452d8306721fdc81006693b7b6595dc9d116cf5c32fa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a036b147e5c1d07185b682330c1a071a6e7701cadff7344d02e66d5e8f7c854e18b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f438203e880a0320c115c93f93985313799d4cf3b8e4911f5372d3f6a47a1bb68fe79a4896392880e17447c57244456f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a050fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03887e5d650905a8d9f2d3452d8306721fdc81006693b7b6595dc9d116cf5c32fa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a036b147e5c1d07185b682330c1a071a6e7701cadff7344d02e66d5e8f7c854e18b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f438203e880a0aa593e522889aa037da830ec8968456cda2cfb6ab65b4ab4a50dd636c53d5aa088d08478bf25808464f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -158,42 +168,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "50fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x50fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "274a6f813a18eb6c739755c0acdbb61ea4108fef09c4c1f8f23941853824aea4",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x274a6f813a18eb6c739755c0acdbb61ea4108fef09c4c1f8f23941853824aea4",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0274a6f813a18eb6c739755c0acdbb61ea4108fef09c4c1f8f23941853824aea4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "88770464662a23cbd36809534b9e21d9750fa65b0a91361cfa0625b1a2d4f02b",
+        "lastblockhash" : "0x35f6995d8ca7e39264ca0f8c62f38f37ca5f3bbeb4065c8ae2cf39bcc1946415",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53f43",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3d0bd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
@@ -203,9 +213,9 @@
                     "0x64" : "0x0836a0"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -213,23 +223,23 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -238,36 +248,41 @@
         }
     },
     "NonZeroValue_DELEGATECALL_ToOneStorageKey_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0927c0",
-                    "hash" : "3b23f31eb2a2b78c1efce6a276e6d8b4e7d9b93f3971e405bcd19273a10eae44",
-                    "mixHash" : "c1da8a2d0480db04fd68136b91d1e87e06fe89081a5bdc650dfeb6afae462643",
-                    "nonce" : "48023fd76770c04e",
+                    "hash" : "0xb6beb1c39b6fa807321c35c7786c865b47c2105d5a4ea9376b086e7bf9cbac8c",
+                    "mixHash" : "0xd658b080d2fe0d5b24e73c9d257c4a661109b81bf2a0a34188e3431d07dbcb8d",
+                    "nonce" : "0x8b3d6b0ddd4f7c92",
                     "number" : "0x01",
-                    "parentHash" : "50fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620",
-                    "receiptTrie" : "0d717d9a97ed1580712269c1a68a4e19dd021c349b57d61aac95db8fb03aa3eb",
-                    "stateRoot" : "6c47898607e843ae984192d2db7258b45e1f22c1908b4b1e3f1410f00401fd4a",
+                    "parentHash" : "0x50fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620",
+                    "receiptTrie" : "0x0d717d9a97ed1580712269c1a68a4e19dd021c349b57d61aac95db8fb03aa3eb",
+                    "stateRoot" : "0x6c47898607e843ae984192d2db7258b45e1f22c1908b4b1e3f1410f00401fd4a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a050fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c47898607e843ae984192d2db7258b45e1f22c1908b4b1e3f1410f00401fd4aa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00d717d9a97ed1580712269c1a68a4e19dd021c349b57d61aac95db8fb03aa3ebb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a0c1da8a2d0480db04fd68136b91d1e87e06fe89081a5bdc650dfeb6afae4626438848023fd76770c04ef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a050fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c47898607e843ae984192d2db7258b45e1f22c1908b4b1e3f1410f00401fd4aa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00d717d9a97ed1580712269c1a68a4e19dd021c349b57d61aac95db8fb03aa3ebb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a0d658b080d2fe0d5b24e73c9d257c4a661109b81bf2a0a34188e3431d07dbcb8d888b3d6b0ddd4f7c92f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -277,51 +292,51 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "50fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x50fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "274a6f813a18eb6c739755c0acdbb61ea4108fef09c4c1f8f23941853824aea4",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x274a6f813a18eb6c739755c0acdbb61ea4108fef09c4c1f8f23941853824aea4",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0274a6f813a18eb6c739755c0acdbb61ea4108fef09c4c1f8f23941853824aea4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3b23f31eb2a2b78c1efce6a276e6d8b4e7d9b93f3971e405bcd19273a10eae44",
+        "lastblockhash" : "0xb6beb1c39b6fa807321c35c7786c865b47c2105d5a4ea9376b086e7bf9cbac8c",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fd27c0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d49be840",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -329,23 +344,23 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -354,36 +369,41 @@
         }
     },
     "NonZeroValue_DELEGATECALL_ToOneStorageKey_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013caf",
-                    "hash" : "587bdfb7a49bc147cb9c4cd3581ad2fc09d5977f9723fa694c8e6c8aab7957b5",
-                    "mixHash" : "72df0fabbae5f80e0cae012c5a6ec12842bfaf7026d6745c6c939a1f77944083",
-                    "nonce" : "1d972550b7337edb",
+                    "hash" : "0x2e987fb119bc87f5cc26a81ec5b1e869a2df683debcb3e35c61fb8dd86945f8a",
+                    "mixHash" : "0x40eff473c904cb300fac5a25817aff3e08387a32b4de25337eff51b1b69bf418",
+                    "nonce" : "0x6b47f21a944b3f1a",
                     "number" : "0x01",
-                    "parentHash" : "50fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620",
-                    "receiptTrie" : "cbdcbebf0592be771acf3d8fdd16971d5a6716feafa811b166347df7227b4966",
-                    "stateRoot" : "1dfc2841483726d9d6a8a8cfb4bc1f76126b40ae0f9ff78b6ff0db8127a07514",
+                    "parentHash" : "0x50fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620",
+                    "receiptTrie" : "0xcbdcbebf0592be771acf3d8fdd16971d5a6716feafa811b166347df7227b4966",
+                    "stateRoot" : "0x1dfc2841483726d9d6a8a8cfb4bc1f76126b40ae0f9ff78b6ff0db8127a07514",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a050fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dfc2841483726d9d6a8a8cfb4bc1f76126b40ae0f9ff78b6ff0db8127a07514a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0cbdcbebf0592be771acf3d8fdd16971d5a6716feafa811b166347df7227b4966b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013caf8203e880a072df0fabbae5f80e0cae012c5a6ec12842bfaf7026d6745c6c939a1f77944083881d972550b7337edbf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a050fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dfc2841483726d9d6a8a8cfb4bc1f76126b40ae0f9ff78b6ff0db8127a07514a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0cbdcbebf0592be771acf3d8fdd16971d5a6716feafa811b166347df7227b4966b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013caf8203e880a040eff473c904cb300fac5a25817aff3e08387a32b4de25337eff51b1b69bf418886b47f21a944b3f1af862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -393,42 +413,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "50fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x50fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "274a6f813a18eb6c739755c0acdbb61ea4108fef09c4c1f8f23941853824aea4",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x274a6f813a18eb6c739755c0acdbb61ea4108fef09c4c1f8f23941853824aea4",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0274a6f813a18eb6c739755c0acdbb61ea4108fef09c4c1f8f23941853824aea4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "587bdfb7a49bc147cb9c4cd3581ad2fc09d5977f9723fa694c8e6c8aab7957b5",
+        "lastblockhash" : "0x2e987fb119bc87f5cc26a81ec5b1e869a2df683debcb3e35c61fb8dd86945f8a",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53caf",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3d351",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
@@ -438,9 +458,140 @@
                     "0x64" : "0x083934"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        }
+    },
+    "NonZeroValue_DELEGATECALL_ToOneStorageKey_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x013f43",
+                    "hash" : "0x3bd08784648ec8183642ce023a06ea56df1d2648f1edb5834c03ba32ca455674",
+                    "mixHash" : "0x1011e3eb91de7790390172c38228b2238677c824cf39d4559f382f16ab8f270b",
+                    "nonce" : "0x27f60b98c01dd573",
+                    "number" : "0x01",
+                    "parentHash" : "0x50fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620",
+                    "receiptTrie" : "0x654f8c8618590326de669ae3486fa496a62382ec27a26fe826143a927be82746",
+                    "stateRoot" : "0xb823c90a95bc6e782502433233da4ab4127f226cacc9ca312c458856b16c4826",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a050fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b823c90a95bc6e782502433233da4ab4127f226cacc9ca312c458856b16c4826a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0654f8c8618590326de669ae3486fa496a62382ec27a26fe826143a927be82746b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f438203e880a01011e3eb91de7790390172c38228b2238677c824cf39d4559f382f16ab8f270b8827f60b98c01dd573f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x50fedcc4bc1526ddfe9af7fec6f3110eee0a1f322c6f3bf8260a46f99310a620",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x274a6f813a18eb6c739755c0acdbb61ea4108fef09c4c1f8f23941853824aea4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0274a6f813a18eb6c739755c0acdbb61ea4108fef09c4c1f8f23941853824aea4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3bd08784648ec8183642ce023a06ea56df1d2648f1edb5834c03ba32ca455674",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f53f43",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3d0bd",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x08d5b6",
+                    "0x01" : "0x01",
+                    "0x64" : "0x0836a0"
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -448,23 +599,23 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_d0g0v0.json
index 654471432..1b3b18c83 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "NonZeroValue_DELEGATECALL_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f43",
-                    "hash" : "423783e3e15cb6da60b5492d5ae70d404ecf0f00df1086d9b203cf5a910fcb30",
-                    "mixHash" : "fa62ec90726ae74aed8e5e0e91afd8f045d962faf0626acc3588b022a72f3b6d",
-                    "nonce" : "3a7764a82819ded6",
+                    "hash" : "0x47482310d664a538b99710e2b0fbbf51c3c48082958bd7ff91eba513d0d912d1",
+                    "mixHash" : "0xcbb9004e8bb916fa7497dc44d8d91d6015b3fbf84e1e75bf3f32763081d485d5",
+                    "nonce" : "0x748e9d0c13d2333c",
                     "number" : "0x01",
-                    "parentHash" : "77d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5",
-                    "receiptTrie" : "d6beb01bc920efdd1ad5435c82e94ceeaca6d3f8a391de64590a1a13a9432f9d",
-                    "stateRoot" : "e98646a453ea5ed7aef0b07525f5fe42830d6d5c50a9bd18147adac36af60925",
+                    "parentHash" : "0x77d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5",
+                    "receiptTrie" : "0xd6beb01bc920efdd1ad5435c82e94ceeaca6d3f8a391de64590a1a13a9432f9d",
+                    "stateRoot" : "0xe98646a453ea5ed7aef0b07525f5fe42830d6d5c50a9bd18147adac36af60925",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a077d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e98646a453ea5ed7aef0b07525f5fe42830d6d5c50a9bd18147adac36af60925a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0d6beb01bc920efdd1ad5435c82e94ceeaca6d3f8a391de64590a1a13a9432f9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f438203e880a0fa62ec90726ae74aed8e5e0e91afd8f045d962faf0626acc3588b022a72f3b6d883a7764a82819ded6f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a077d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e98646a453ea5ed7aef0b07525f5fe42830d6d5c50a9bd18147adac36af60925a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0d6beb01bc920efdd1ad5435c82e94ceeaca6d3f8a391de64590a1a13a9432f9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f438203e880a0cbb9004e8bb916fa7497dc44d8d91d6015b3fbf84e1e75bf3f32763081d485d588748e9d0c13d2333cf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,42 +44,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "77d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x77d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9f53e4a1ba9cbd38c2d9403e371e28242197238b3038dc4b6d2747e77b0ff9f6",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9f53e4a1ba9cbd38c2d9403e371e28242197238b3038dc4b6d2747e77b0ff9f6",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f53e4a1ba9cbd38c2d9403e371e28242197238b3038dc4b6d2747e77b0ff9f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "423783e3e15cb6da60b5492d5ae70d404ecf0f00df1086d9b203cf5a910fcb30",
+        "lastblockhash" : "0x47482310d664a538b99710e2b0fbbf51c3c48082958bd7ff91eba513d0d912d1",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53f43",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3d0bd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
@@ -86,14 +91,14 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
@@ -103,36 +108,41 @@
         }
     },
     "NonZeroValue_DELEGATECALL_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f43",
-                    "hash" : "6e39c11b66541fe3794e16d1a867694317a994821c6daa870511f4ff4eafb3fe",
-                    "mixHash" : "2735b0bec89a1bc2d76d248b9bed75cd623f020f1ba69f9df82581bccbb82475",
-                    "nonce" : "9077896de1c7f0ea",
+                    "hash" : "0xd326d0e7f2239a2aa9f37f2b4bcf59ccf372d1208091178c632acb7f4877fce3",
+                    "mixHash" : "0x8b67d4474bdf1ce8621a81e61487878eb3f3b7c74b5b386a347a643dd5bcf6db",
+                    "nonce" : "0xfaefb34c6ab1503d",
                     "number" : "0x01",
-                    "parentHash" : "77d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5",
-                    "receiptTrie" : "d6beb01bc920efdd1ad5435c82e94ceeaca6d3f8a391de64590a1a13a9432f9d",
-                    "stateRoot" : "e98646a453ea5ed7aef0b07525f5fe42830d6d5c50a9bd18147adac36af60925",
+                    "parentHash" : "0x77d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5",
+                    "receiptTrie" : "0xd6beb01bc920efdd1ad5435c82e94ceeaca6d3f8a391de64590a1a13a9432f9d",
+                    "stateRoot" : "0xe98646a453ea5ed7aef0b07525f5fe42830d6d5c50a9bd18147adac36af60925",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a077d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e98646a453ea5ed7aef0b07525f5fe42830d6d5c50a9bd18147adac36af60925a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0d6beb01bc920efdd1ad5435c82e94ceeaca6d3f8a391de64590a1a13a9432f9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f438203e880a02735b0bec89a1bc2d76d248b9bed75cd623f020f1ba69f9df82581bccbb82475889077896de1c7f0eaf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a077d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e98646a453ea5ed7aef0b07525f5fe42830d6d5c50a9bd18147adac36af60925a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0d6beb01bc920efdd1ad5435c82e94ceeaca6d3f8a391de64590a1a13a9432f9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f438203e880a08b67d4474bdf1ce8621a81e61487878eb3f3b7c74b5b386a347a643dd5bcf6db88faefb34c6ab1503df862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -142,42 +152,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "77d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x77d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9f53e4a1ba9cbd38c2d9403e371e28242197238b3038dc4b6d2747e77b0ff9f6",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9f53e4a1ba9cbd38c2d9403e371e28242197238b3038dc4b6d2747e77b0ff9f6",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f53e4a1ba9cbd38c2d9403e371e28242197238b3038dc4b6d2747e77b0ff9f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "6e39c11b66541fe3794e16d1a867694317a994821c6daa870511f4ff4eafb3fe",
+        "lastblockhash" : "0xd326d0e7f2239a2aa9f37f2b4bcf59ccf372d1208091178c632acb7f4877fce3",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53f43",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3d0bd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
@@ -189,14 +199,14 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
@@ -206,36 +216,41 @@
         }
     },
     "NonZeroValue_DELEGATECALL_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0927c0",
-                    "hash" : "8d996d20848dad811c10ed50f771b3d130ab18bf99141d749653e653baba9a8b",
-                    "mixHash" : "1fa9acd5245b59ab6a4c52f34103764b90ba977dd0cc69a3d9dc5050be8476b1",
-                    "nonce" : "81f3812b7d56633d",
+                    "hash" : "0xa135f9dcfa505129065970aaca807a4571aec9b0641546e91d12e38e223a74be",
+                    "mixHash" : "0xe53b0eb891552cc1d9b65d4697469ebd1e111958fb633004ce9eac191bde31a2",
+                    "nonce" : "0x3c4a54235521e677",
                     "number" : "0x01",
-                    "parentHash" : "77d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5",
-                    "receiptTrie" : "ad12f3402a505e4e8ad9027015030dcec48e951b21477d688fe0196322cc1320",
-                    "stateRoot" : "21fe10ecfc52b41e03058889c277fd104f319538c44692e96c93babc9287e4fe",
+                    "parentHash" : "0x77d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5",
+                    "receiptTrie" : "0xad12f3402a505e4e8ad9027015030dcec48e951b21477d688fe0196322cc1320",
+                    "stateRoot" : "0x21fe10ecfc52b41e03058889c277fd104f319538c44692e96c93babc9287e4fe",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a077d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021fe10ecfc52b41e03058889c277fd104f319538c44692e96c93babc9287e4fea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0ad12f3402a505e4e8ad9027015030dcec48e951b21477d688fe0196322cc1320b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a01fa9acd5245b59ab6a4c52f34103764b90ba977dd0cc69a3d9dc5050be8476b18881f3812b7d56633df862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a077d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021fe10ecfc52b41e03058889c277fd104f319538c44692e96c93babc9287e4fea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0ad12f3402a505e4e8ad9027015030dcec48e951b21477d688fe0196322cc1320b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a0e53b0eb891552cc1d9b65d4697469ebd1e111958fb633004ce9eac191bde31a2883c4a54235521e677f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -245,42 +260,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "77d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x77d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9f53e4a1ba9cbd38c2d9403e371e28242197238b3038dc4b6d2747e77b0ff9f6",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9f53e4a1ba9cbd38c2d9403e371e28242197238b3038dc4b6d2747e77b0ff9f6",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f53e4a1ba9cbd38c2d9403e371e28242197238b3038dc4b6d2747e77b0ff9f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8d996d20848dad811c10ed50f771b3d130ab18bf99141d749653e653baba9a8b",
+        "lastblockhash" : "0xa135f9dcfa505129065970aaca807a4571aec9b0641546e91d12e38e223a74be",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fd27c0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d49be840",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
@@ -289,14 +304,14 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
@@ -306,36 +321,41 @@
         }
     },
     "NonZeroValue_DELEGATECALL_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013caf",
-                    "hash" : "269ed4e031c2b94d6211b04643bee17138f7e676c958a71f1a82c4911ba482ea",
-                    "mixHash" : "a66f9bf146fafe1d66aac062c202a5f01c30677314db1b45661cafaf3adcb8f3",
-                    "nonce" : "7cb811e54bca31e2",
+                    "hash" : "0x74a06f613b97c90c7510f58998f54d117d13f8a81459e665f16badafb0b0c0a7",
+                    "mixHash" : "0x7b93448fa61245d97046733d3675bfdac0339133d1a00a9a9eb4c1698f809f79",
+                    "nonce" : "0x2ddf1c82d24207f1",
                     "number" : "0x01",
-                    "parentHash" : "77d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5",
-                    "receiptTrie" : "e1d532a09dd8764f206865954ce897817c38d82d53b8632e46693a4a2042e8ca",
-                    "stateRoot" : "a325c8092b9c3fb158c7647310b75df08c51ae3848686c2f1ca6f48bc971d710",
+                    "parentHash" : "0x77d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5",
+                    "receiptTrie" : "0xe1d532a09dd8764f206865954ce897817c38d82d53b8632e46693a4a2042e8ca",
+                    "stateRoot" : "0xa325c8092b9c3fb158c7647310b75df08c51ae3848686c2f1ca6f48bc971d710",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a077d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a325c8092b9c3fb158c7647310b75df08c51ae3848686c2f1ca6f48bc971d710a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0e1d532a09dd8764f206865954ce897817c38d82d53b8632e46693a4a2042e8cab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013caf8203e880a0a66f9bf146fafe1d66aac062c202a5f01c30677314db1b45661cafaf3adcb8f3887cb811e54bca31e2f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a077d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a325c8092b9c3fb158c7647310b75df08c51ae3848686c2f1ca6f48bc971d710a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0e1d532a09dd8764f206865954ce897817c38d82d53b8632e46693a4a2042e8cab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013caf8203e880a07b93448fa61245d97046733d3675bfdac0339133d1a00a9a9eb4c1698f809f79882ddf1c82d24207f1f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -345,42 +365,42 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "77d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x77d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9f53e4a1ba9cbd38c2d9403e371e28242197238b3038dc4b6d2747e77b0ff9f6",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9f53e4a1ba9cbd38c2d9403e371e28242197238b3038dc4b6d2747e77b0ff9f6",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f53e4a1ba9cbd38c2d9403e371e28242197238b3038dc4b6d2747e77b0ff9f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "269ed4e031c2b94d6211b04643bee17138f7e676c958a71f1a82c4911ba482ea",
+        "lastblockhash" : "0x74a06f613b97c90c7510f58998f54d117d13f8a81459e665f16badafb0b0c0a7",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53caf",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a3d351",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
@@ -392,14 +412,129 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NonZeroValue_DELEGATECALL_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x013f43",
+                    "hash" : "0xd4afe5f0acfa01a159328708418ee54478b0de1898f86c49d18883fea6470448",
+                    "mixHash" : "0x8ed7d85720d0bb1ed590e62a3db7acc11ac486c4aa0005c167f9bfdb991513ec",
+                    "nonce" : "0x5d181031d69fd1b7",
+                    "number" : "0x01",
+                    "parentHash" : "0x77d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5",
+                    "receiptTrie" : "0x654f8c8618590326de669ae3486fa496a62382ec27a26fe826143a927be82746",
+                    "stateRoot" : "0x0a728aa3228fd3ffef876f4b102c0cb937fe8995dff4d9b057946a238b97f10e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a077d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a728aa3228fd3ffef876f4b102c0cb937fe8995dff4d9b057946a238b97f10ea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0654f8c8618590326de669ae3486fa496a62382ec27a26fe826143a927be82746b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f438203e880a08ed7d85720d0bb1ed590e62a3db7acc11ac486c4aa0005c167f9bfdb991513ec885d181031d69fd1b7f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x77d67124c272fb6030ad683ed84d5df991daee35a1a29bf233603d2b009099d5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9f53e4a1ba9cbd38c2d9403e371e28242197238b3038dc4b6d2747e77b0ff9f6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f53e4a1ba9cbd38c2d9403e371e28242197238b3038dc4b6d2747e77b0ff9f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd4afe5f0acfa01a159328708418ee54478b0de1898f86c49d18883fea6470448",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f53f43",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3d0bd",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x08d5b6",
+                    "0x01" : "0x01",
+                    "0x64" : "0x0836a0"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty_d0g0v0.json
index cf95cd99c..bcade7792 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty_d0g0v0.json
@@ -1,35 +1,40 @@
 {
-    "NonZeroValue_SELFDESTRUCT_ToEmpty_d0g0v0_EIP150" : {
+    "NonZeroValue_SUICIDE_ToEmpty_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x32ca",
-                    "hash" : "1e2dcd829d98e2275df6790cf65708553ac3185f878e16ccbb9bd7140e36e3f5",
-                    "mixHash" : "62491b47258c69e4d01b28758e8273a3edab7bd0803d5436a8f2f5eb564a222d",
-                    "nonce" : "2a48db25be87555f",
+                    "hash" : "0x606e8434ea110696b6ff74d461605cb41ee9400eeb0f50b0fbda4a2f761137a7",
+                    "mixHash" : "0x7fe6ac8b9f8123cbe11c91d66c33b9d4af995579b5862ca91726be8fa1e435e7",
+                    "nonce" : "0x41b4aae4a92d45a1",
                     "number" : "0x01",
-                    "parentHash" : "079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08",
-                    "receiptTrie" : "ca4bcbdc542ffa191471137562f87367232cdebedda2276c6633c2dbc7124572",
-                    "stateRoot" : "ae0bc66d83188a73b5d1ac6663a7151a66b41b16f904964729f49e9c6c3f8031",
+                    "parentHash" : "0x079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08",
+                    "receiptTrie" : "0xca4bcbdc542ffa191471137562f87367232cdebedda2276c6633c2dbc7124572",
+                    "stateRoot" : "0xae0bc66d83188a73b5d1ac6663a7151a66b41b16f904964729f49e9c6c3f8031",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae0bc66d83188a73b5d1ac6663a7151a66b41b16f904964729f49e9c6c3f8031a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0ca4bcbdc542ffa191471137562f87367232cdebedda2276c6633c2dbc7124572b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808232ca8203e880a062491b47258c69e4d01b28758e8273a3edab7bd0803d5436a8f2f5eb564a222d882a48db25be87555ff862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a0079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae0bc66d83188a73b5d1ac6663a7151a66b41b16f904964729f49e9c6c3f8031a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0ca4bcbdc542ffa191471137562f87367232cdebedda2276c6633c2dbc7124572b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808232ca8203e880a07fe6ac8b9f8123cbe11c91d66c33b9d4af995579b5862ca91726be8fa1e435e78841b4aae4a92d45a1f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,104 +44,109 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f12385c1eb98862ec82567c49758807339cd1ca07e27d6c2f94e0b9682b3d4de",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf12385c1eb98862ec82567c49758807339cd1ca07e27d6c2f94e0b9682b3d4de",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f12385c1eb98862ec82567c49758807339cd1ca07e27d6c2f94e0b9682b3d4dea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "1e2dcd829d98e2275df6790cf65708553ac3185f878e16ccbb9bd7140e36e3f5",
+        "lastblockhash" : "0x606e8434ea110696b6ff74d461605cb41ee9400eeb0f50b0fbda4a2f761137a7",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f432ca",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4dd36",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         }
     },
-    "NonZeroValue_SELFDESTRUCT_ToEmpty_d0g0v0_EIP158" : {
+    "NonZeroValue_SUICIDE_ToEmpty_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x697b",
-                    "hash" : "ac6de89657498a061dd1dd2e3d500009007a826edeb641d21440d6eec8c29568",
-                    "mixHash" : "ab6381d0a70d7bdfb7e243ea5c6144841ca7aa2697f9bce79a0acc50e4cde568",
-                    "nonce" : "c29d91806d780b29",
+                    "hash" : "0xf68abbeae7747448041b65ef66a7fbc6d652e6f598149dd17c252ec084a511c0",
+                    "mixHash" : "0x2ab8fbf3af45139b0844c59c7c56cc08597ef97bd9e3369200a7bea37886614b",
+                    "nonce" : "0x37a96147146b4309",
                     "number" : "0x01",
-                    "parentHash" : "079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08",
-                    "receiptTrie" : "2310d54366a7465c02d9f29bd2b93c38168bb3d837add2f2192146bd0ed34717",
-                    "stateRoot" : "c818004ab0c3303f2facae961664c7f0cdd379d270bebb049ec8e7ef9efaefad",
+                    "parentHash" : "0x079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08",
+                    "receiptTrie" : "0x2310d54366a7465c02d9f29bd2b93c38168bb3d837add2f2192146bd0ed34717",
+                    "stateRoot" : "0xc818004ab0c3303f2facae961664c7f0cdd379d270bebb049ec8e7ef9efaefad",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c818004ab0c3303f2facae961664c7f0cdd379d270bebb049ec8e7ef9efaefada059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a02310d54366a7465c02d9f29bd2b93c38168bb3d837add2f2192146bd0ed34717b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a0ab6381d0a70d7bdfb7e243ea5c6144841ca7aa2697f9bce79a0acc50e4cde56888c29d91806d780b29f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a0079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c818004ab0c3303f2facae961664c7f0cdd379d270bebb049ec8e7ef9efaefada059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a02310d54366a7465c02d9f29bd2b93c38168bb3d837add2f2192146bd0ed34717b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a02ab8fbf3af45139b0844c59c7c56cc08597ef97bd9e3369200a7bea37886614b8837a96147146b4309f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -146,104 +156,109 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f12385c1eb98862ec82567c49758807339cd1ca07e27d6c2f94e0b9682b3d4de",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf12385c1eb98862ec82567c49758807339cd1ca07e27d6c2f94e0b9682b3d4de",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f12385c1eb98862ec82567c49758807339cd1ca07e27d6c2f94e0b9682b3d4dea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ac6de89657498a061dd1dd2e3d500009007a826edeb641d21440d6eec8c29568",
+        "lastblockhash" : "0xf68abbeae7747448041b65ef66a7fbc6d652e6f598149dd17c252ec084a511c0",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4697b",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4a685",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         }
     },
-    "NonZeroValue_SELFDESTRUCT_ToEmpty_d0g0v0_Frontier" : {
+    "NonZeroValue_SUICIDE_ToEmpty_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x2906",
-                    "hash" : "a9d47ba4f1fae827a10e05692f00d0533ba031c9ec6cfb63c4e8192c6009bc62",
-                    "mixHash" : "5c60fa261c33a7cfc710ffd169b0d14757188cb9dd568b04a237cd1c31a6d636",
-                    "nonce" : "c24ad7804b873feb",
+                    "hash" : "0xcf139db152152bab3594140dba9de59a61abf6aad76ed4dcff1bd75c91dad647",
+                    "mixHash" : "0x49464af16ab749cfff42a15da7c97a28ab68226232e1c98280fdde0d03aba915",
+                    "nonce" : "0xb372aa63270ad4d9",
                     "number" : "0x01",
-                    "parentHash" : "079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08",
-                    "receiptTrie" : "6e479760edf098dc1ea0823c7e9cf4184af552b6b2aca01fc3810fdeb36caf60",
-                    "stateRoot" : "da0a9513c292c9b69e7b4463a250e71a8101763f45a11d3c5d2cefc902a14dae",
+                    "parentHash" : "0x079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08",
+                    "receiptTrie" : "0x6e479760edf098dc1ea0823c7e9cf4184af552b6b2aca01fc3810fdeb36caf60",
+                    "stateRoot" : "0xda0a9513c292c9b69e7b4463a250e71a8101763f45a11d3c5d2cefc902a14dae",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da0a9513c292c9b69e7b4463a250e71a8101763f45a11d3c5d2cefc902a14daea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a06e479760edf098dc1ea0823c7e9cf4184af552b6b2aca01fc3810fdeb36caf60b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a05c60fa261c33a7cfc710ffd169b0d14757188cb9dd568b04a237cd1c31a6d63688c24ad7804b873febf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a0079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da0a9513c292c9b69e7b4463a250e71a8101763f45a11d3c5d2cefc902a14daea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a06e479760edf098dc1ea0823c7e9cf4184af552b6b2aca01fc3810fdeb36caf60b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a049464af16ab749cfff42a15da7c97a28ab68226232e1c98280fdde0d03aba91588b372aa63270ad4d9f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -253,104 +268,109 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f12385c1eb98862ec82567c49758807339cd1ca07e27d6c2f94e0b9682b3d4de",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf12385c1eb98862ec82567c49758807339cd1ca07e27d6c2f94e0b9682b3d4de",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f12385c1eb98862ec82567c49758807339cd1ca07e27d6c2f94e0b9682b3d4dea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a9d47ba4f1fae827a10e05692f00d0533ba031c9ec6cfb63c4e8192c6009bc62",
+        "lastblockhash" : "0xcf139db152152bab3594140dba9de59a61abf6aad76ed4dcff1bd75c91dad647",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f42906",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4e6fa",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         }
     },
-    "NonZeroValue_SELFDESTRUCT_ToEmpty_d0g0v0_Homestead" : {
+    "NonZeroValue_SUICIDE_ToEmpty_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x2906",
-                    "hash" : "c7cb7fa26b48d01ce5295ac6fc80f2477c5e859a65f79bb2382b14563beee5f9",
-                    "mixHash" : "e62e5f9969f4dab331ecb0aeb519ffffeda9964c64dc245f6733a1a97e5e0e25",
-                    "nonce" : "97c67d9b32f4b29a",
+                    "hash" : "0xd1ae73086a1ab59f58234f6051362cec6882239367ee92a47adaf8a27ebffc91",
+                    "mixHash" : "0x8330b74824e486bc11c1a0cbc3d7cd8ef0773b0f9768f5f2a376735be79d8e50",
+                    "nonce" : "0x5db1eb2cfdd1e0c8",
                     "number" : "0x01",
-                    "parentHash" : "079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08",
-                    "receiptTrie" : "6e479760edf098dc1ea0823c7e9cf4184af552b6b2aca01fc3810fdeb36caf60",
-                    "stateRoot" : "da0a9513c292c9b69e7b4463a250e71a8101763f45a11d3c5d2cefc902a14dae",
+                    "parentHash" : "0x079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08",
+                    "receiptTrie" : "0x6e479760edf098dc1ea0823c7e9cf4184af552b6b2aca01fc3810fdeb36caf60",
+                    "stateRoot" : "0xda0a9513c292c9b69e7b4463a250e71a8101763f45a11d3c5d2cefc902a14dae",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da0a9513c292c9b69e7b4463a250e71a8101763f45a11d3c5d2cefc902a14daea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a06e479760edf098dc1ea0823c7e9cf4184af552b6b2aca01fc3810fdeb36caf60b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a0e62e5f9969f4dab331ecb0aeb519ffffeda9964c64dc245f6733a1a97e5e0e258897c67d9b32f4b29af862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a0079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da0a9513c292c9b69e7b4463a250e71a8101763f45a11d3c5d2cefc902a14daea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a06e479760edf098dc1ea0823c7e9cf4184af552b6b2aca01fc3810fdeb36caf60b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a08330b74824e486bc11c1a0cbc3d7cd8ef0773b0f9768f5f2a376735be79d8e50885db1eb2cfdd1e0c8f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -360,67 +380,186 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f12385c1eb98862ec82567c49758807339cd1ca07e27d6c2f94e0b9682b3d4de",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf12385c1eb98862ec82567c49758807339cd1ca07e27d6c2f94e0b9682b3d4de",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f12385c1eb98862ec82567c49758807339cd1ca07e27d6c2f94e0b9682b3d4dea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c7cb7fa26b48d01ce5295ac6fc80f2477c5e859a65f79bb2382b14563beee5f9",
+        "lastblockhash" : "0xd1ae73086a1ab59f58234f6051362cec6882239367ee92a47adaf8a27ebffc91",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f42906",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4e6fa",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NonZeroValue_SUICIDE_ToEmpty_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x697b",
+                    "hash" : "0x4c65e2c78c521c7e240312f93d5557b81f3a2c4505d05afaceaaa0f481ab749f",
+                    "mixHash" : "0x3680d1c1037793948b7106fba428ab891c7c9a99bbc6dfcfc25013a4940b72d1",
+                    "nonce" : "0x40139129fe521d16",
+                    "number" : "0x01",
+                    "parentHash" : "0x079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08",
+                    "receiptTrie" : "0x11b9a3af527495821ab161c2237f35f6a032d0dc5e9ee404f60ba12f9b7c26a9",
+                    "stateRoot" : "0x7f38c17ec584cc7acdf0baec3467ab6516307afdddf83a31f876b7d60a4ad322",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a0079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f38c17ec584cc7acdf0baec3467ab6516307afdddf83a31f876b7d60a4ad322a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a011b9a3af527495821ab161c2237f35f6a032d0dc5e9ee404f60ba12f9b7c26a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a03680d1c1037793948b7106fba428ab891c7c9a99bbc6dfcfc25013a4940b72d18840139129fe521d16f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x079d717cf4b6f92d2aa3735d9faff9b20d696a3f0fdcc934b0989e944f63de08",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf12385c1eb98862ec82567c49758807339cd1ca07e27d6c2f94e0b9682b3d4de",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f12385c1eb98862ec82567c49758807339cd1ca07e27d6c2f94e0b9682b3d4dea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4c65e2c78c521c7e240312f93d5557b81f3a2c4505d05afaceaaa0f481ab749f",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4697b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4a685",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0.json
index 1d7ed1d3e..7f0e4ffed 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0.json
@@ -1,35 +1,40 @@
 {
-    "NonZeroValue_SELFDESTRUCT_ToNonNonZeroBalance_d0g0v0_EIP150" : {
+    "NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x32ca",
-                    "hash" : "a6e51f4b4e43670855be3cc1adfa839a39c2963849526099745ed3c8bb80cbd0",
-                    "mixHash" : "f0c0c9151dc5006121ec5c0085cf238e0489c949b39c527f518ad01ee87bc19f",
-                    "nonce" : "d44fa2ea1c377c79",
+                    "hash" : "0xb2e89832a452e351554aed24f5bd11e03c9a3c14e37186d6f43528743dff7c8f",
+                    "mixHash" : "0xb5917d02bfad22cef4880fbabd23a9fb1feee182a4405d46eaa77bc9d4875569",
+                    "nonce" : "0xa0a873d1381aef90",
                     "number" : "0x01",
-                    "parentHash" : "7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
-                    "receiptTrie" : "c52fe4e852471ccb501afd5d39db7d29bfed0088dd9d6993da0461e4359a9120",
-                    "stateRoot" : "c85c7cb6c2621fb156503ad635bb9ecbc88e7be088a03c9aaa1b75a5ebccfbe0",
+                    "parentHash" : "0x7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
+                    "receiptTrie" : "0xc52fe4e852471ccb501afd5d39db7d29bfed0088dd9d6993da0461e4359a9120",
+                    "stateRoot" : "0xc85c7cb6c2621fb156503ad635bb9ecbc88e7be088a03c9aaa1b75a5ebccfbe0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a07eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c85c7cb6c2621fb156503ad635bb9ecbc88e7be088a03c9aaa1b75a5ebccfbe0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0c52fe4e852471ccb501afd5d39db7d29bfed0088dd9d6993da0461e4359a9120b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808232ca8203e880a0f0c0c9151dc5006121ec5c0085cf238e0489c949b39c527f518ad01ee87bc19f88d44fa2ea1c377c79f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a07eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c85c7cb6c2621fb156503ad635bb9ecbc88e7be088a03c9aaa1b75a5ebccfbe0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0c52fe4e852471ccb501afd5d39db7d29bfed0088dd9d6993da0461e4359a9120b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808232ca8203e880a0b5917d02bfad22cef4880fbabd23a9fb1feee182a4405d46eaa77bc9d487556988a0a873d1381aef90f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,104 +44,109 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6c9749b7f1c36a9199b9db71547281074de106c4c784a65277da88d57727893f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6c9749b7f1c36a9199b9db71547281074de106c4c784a65277da88d57727893f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c9749b7f1c36a9199b9db71547281074de106c4c784a65277da88d57727893fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a6e51f4b4e43670855be3cc1adfa839a39c2963849526099745ed3c8bb80cbd0",
+        "lastblockhash" : "0xb2e89832a452e351554aed24f5bd11e03c9a3c14e37186d6f43528743dff7c8f",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f432ca",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4dd36",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x65",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         }
     },
-    "NonZeroValue_SELFDESTRUCT_ToNonNonZeroBalance_d0g0v0_EIP158" : {
+    "NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x32ca",
-                    "hash" : "6d9a28543af64f0dfeffa78f7ae62b4a25d432f205bb632eb90df14431a46d0b",
-                    "mixHash" : "a698f658d6156a54f9ed79694e42ca06ee87eace46a0739fda7b34d668a4e3dd",
-                    "nonce" : "df2d3c888439e924",
+                    "hash" : "0x4c7105fdf606951119dc9a389d03ecd44cbe5c69ec06a90d0b1bbd9d387eaf81",
+                    "mixHash" : "0x47fe91a1cd76a611484064c07dbffb773cb91e741948e5b361afc6c839d33e9f",
+                    "nonce" : "0x8646bd2fa05ea55d",
                     "number" : "0x01",
-                    "parentHash" : "7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
-                    "receiptTrie" : "c52fe4e852471ccb501afd5d39db7d29bfed0088dd9d6993da0461e4359a9120",
-                    "stateRoot" : "c85c7cb6c2621fb156503ad635bb9ecbc88e7be088a03c9aaa1b75a5ebccfbe0",
+                    "parentHash" : "0x7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
+                    "receiptTrie" : "0xc52fe4e852471ccb501afd5d39db7d29bfed0088dd9d6993da0461e4359a9120",
+                    "stateRoot" : "0xc85c7cb6c2621fb156503ad635bb9ecbc88e7be088a03c9aaa1b75a5ebccfbe0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a07eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c85c7cb6c2621fb156503ad635bb9ecbc88e7be088a03c9aaa1b75a5ebccfbe0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0c52fe4e852471ccb501afd5d39db7d29bfed0088dd9d6993da0461e4359a9120b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808232ca8203e880a0a698f658d6156a54f9ed79694e42ca06ee87eace46a0739fda7b34d668a4e3dd88df2d3c888439e924f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a07eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c85c7cb6c2621fb156503ad635bb9ecbc88e7be088a03c9aaa1b75a5ebccfbe0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0c52fe4e852471ccb501afd5d39db7d29bfed0088dd9d6993da0461e4359a9120b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808232ca8203e880a047fe91a1cd76a611484064c07dbffb773cb91e741948e5b361afc6c839d33e9f888646bd2fa05ea55df862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -146,104 +156,109 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6c9749b7f1c36a9199b9db71547281074de106c4c784a65277da88d57727893f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6c9749b7f1c36a9199b9db71547281074de106c4c784a65277da88d57727893f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c9749b7f1c36a9199b9db71547281074de106c4c784a65277da88d57727893fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "6d9a28543af64f0dfeffa78f7ae62b4a25d432f205bb632eb90df14431a46d0b",
+        "lastblockhash" : "0x4c7105fdf606951119dc9a389d03ecd44cbe5c69ec06a90d0b1bbd9d387eaf81",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f432ca",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4dd36",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x65",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         }
     },
-    "NonZeroValue_SELFDESTRUCT_ToNonNonZeroBalance_d0g0v0_Frontier" : {
+    "NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x2906",
-                    "hash" : "19f98de3354a9169b7ddf702631fd67e238ecf5969f56b07f9e78e06084da4b0",
-                    "mixHash" : "fb64a1f8a2232821b7b08ee6aa86cefd934a8b6a6a1715bfbd8165bfdd721053",
-                    "nonce" : "8125d53af3e21fcb",
+                    "hash" : "0xc5b3b92b72ceb2159cf618f27a78d5905361d7d7eaab01e620cd0570cdc86d3c",
+                    "mixHash" : "0x8834e8e3feab35c6e328355ca7eb27bf21d7c1aaf86dabdd012a80a2c8a1c970",
+                    "nonce" : "0xc798748ef3ac7e26",
                     "number" : "0x01",
-                    "parentHash" : "7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
-                    "receiptTrie" : "23af8c013acb7224a1f9236ddb5a824865071779bd45738a02adb65056608c07",
-                    "stateRoot" : "495f893c979d7339ae2bcc454fedbbd7ab1a954a61729f362dbe902e212a5f29",
+                    "parentHash" : "0x7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
+                    "receiptTrie" : "0x23af8c013acb7224a1f9236ddb5a824865071779bd45738a02adb65056608c07",
+                    "stateRoot" : "0x495f893c979d7339ae2bcc454fedbbd7ab1a954a61729f362dbe902e212a5f29",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a07eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0495f893c979d7339ae2bcc454fedbbd7ab1a954a61729f362dbe902e212a5f29a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a023af8c013acb7224a1f9236ddb5a824865071779bd45738a02adb65056608c07b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a0fb64a1f8a2232821b7b08ee6aa86cefd934a8b6a6a1715bfbd8165bfdd721053888125d53af3e21fcbf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a07eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0495f893c979d7339ae2bcc454fedbbd7ab1a954a61729f362dbe902e212a5f29a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a023af8c013acb7224a1f9236ddb5a824865071779bd45738a02adb65056608c07b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a08834e8e3feab35c6e328355ca7eb27bf21d7c1aaf86dabdd012a80a2c8a1c97088c798748ef3ac7e26f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -253,104 +268,109 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6c9749b7f1c36a9199b9db71547281074de106c4c784a65277da88d57727893f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6c9749b7f1c36a9199b9db71547281074de106c4c784a65277da88d57727893f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c9749b7f1c36a9199b9db71547281074de106c4c784a65277da88d57727893fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "19f98de3354a9169b7ddf702631fd67e238ecf5969f56b07f9e78e06084da4b0",
+        "lastblockhash" : "0xc5b3b92b72ceb2159cf618f27a78d5905361d7d7eaab01e620cd0570cdc86d3c",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f42906",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4e6fa",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x65",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         }
     },
-    "NonZeroValue_SELFDESTRUCT_ToNonNonZeroBalance_d0g0v0_Homestead" : {
+    "NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x2906",
-                    "hash" : "a3d65d992c9e4d92b04259472d105654dac302379127b6c24c0c3432860b072d",
-                    "mixHash" : "60d7f6711f8ba131955f8f104587c3895f039e17e0fe38d2af1557489b3435c8",
-                    "nonce" : "4696a60d7e9a512b",
+                    "hash" : "0x57fb3f16628bcd8a702a59e83bac9ba7bee63b5b00ce77bd77a4d98dfe9f950d",
+                    "mixHash" : "0xa4a711de650f7da461b7a44dcfe96f670f1577bf748cac9ca9a4cdd3f28c03a1",
+                    "nonce" : "0xf391c3abf99a5502",
                     "number" : "0x01",
-                    "parentHash" : "7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
-                    "receiptTrie" : "23af8c013acb7224a1f9236ddb5a824865071779bd45738a02adb65056608c07",
-                    "stateRoot" : "495f893c979d7339ae2bcc454fedbbd7ab1a954a61729f362dbe902e212a5f29",
+                    "parentHash" : "0x7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
+                    "receiptTrie" : "0x23af8c013acb7224a1f9236ddb5a824865071779bd45738a02adb65056608c07",
+                    "stateRoot" : "0x495f893c979d7339ae2bcc454fedbbd7ab1a954a61729f362dbe902e212a5f29",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a07eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0495f893c979d7339ae2bcc454fedbbd7ab1a954a61729f362dbe902e212a5f29a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a023af8c013acb7224a1f9236ddb5a824865071779bd45738a02adb65056608c07b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a060d7f6711f8ba131955f8f104587c3895f039e17e0fe38d2af1557489b3435c8884696a60d7e9a512bf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a07eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0495f893c979d7339ae2bcc454fedbbd7ab1a954a61729f362dbe902e212a5f29a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a023af8c013acb7224a1f9236ddb5a824865071779bd45738a02adb65056608c07b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a0a4a711de650f7da461b7a44dcfe96f670f1577bf748cac9ca9a4cdd3f28c03a188f391c3abf99a5502f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -360,67 +380,186 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6c9749b7f1c36a9199b9db71547281074de106c4c784a65277da88d57727893f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6c9749b7f1c36a9199b9db71547281074de106c4c784a65277da88d57727893f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c9749b7f1c36a9199b9db71547281074de106c4c784a65277da88d57727893fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a3d65d992c9e4d92b04259472d105654dac302379127b6c24c0c3432860b072d",
+        "lastblockhash" : "0x57fb3f16628bcd8a702a59e83bac9ba7bee63b5b00ce77bd77a4d98dfe9f950d",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f42906",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4e6fa",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x65",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x32ca",
+                    "hash" : "0xfed5043ae8153d0f8d1f9392836fa97a57033eaa660aaf2e882bdd9b3f78e84e",
+                    "mixHash" : "0x747c7776dc610d8f12aa5c45dca75e0c56b422abd5af0e7166c574d9c50fc791",
+                    "nonce" : "0xd027784c9dcb879c",
+                    "number" : "0x01",
+                    "parentHash" : "0x7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
+                    "receiptTrie" : "0xbdc6970604c358a6e29ea6d74bc6182566b1d8479b2d5fdae39ff17df01813d7",
+                    "stateRoot" : "0x7662b62b15e28df5e8219dce89f4056a2b30b6bac46fb13c6dbfa21c768acffe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a07eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07662b62b15e28df5e8219dce89f4056a2b30b6bac46fb13c6dbfa21c768acffea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0bdc6970604c358a6e29ea6d74bc6182566b1d8479b2d5fdae39ff17df01813d7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808232ca8203e880a0747c7776dc610d8f12aa5c45dca75e0c56b422abd5af0e7166c574d9c50fc79188d027784c9dcb879cf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6c9749b7f1c36a9199b9db71547281074de106c4c784a65277da88d57727893f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c9749b7f1c36a9199b9db71547281074de106c4c784a65277da88d57727893fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfed5043ae8153d0f8d1f9392836fa97a57033eaa660aaf2e882bdd9b3f78e84e",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f432ca",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4dd36",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x65",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey_d0g0v0.json
index 9fb868ed8..a9c2bd678 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey_d0g0v0.json
@@ -1,35 +1,40 @@
 {
-    "NonZeroValue_SELFDESTRUCT_ToOneStorageKey_d0g0v0_EIP150" : {
+    "NonZeroValue_SUICIDE_ToOneStorageKey_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x32ca",
-                    "hash" : "39b77068f80f625a3c2d5a98e2f9f8c0f2bfb50b5fabac543db6f12a63b23100",
-                    "mixHash" : "b2dad1cc38a5a2e627b5878801511086945d0677b34d87c932998091890abef0",
-                    "nonce" : "abfe48667021de7a",
+                    "hash" : "0x601723eb8f91cf36ef0b2030980725da8e5b72f4812ec7da1a0b0d406b8c5658",
+                    "mixHash" : "0x7152ae0a9aa4ba5c12d4403dd63f4767fbd16d2aac37a5cd2f3079d24bf7cafc",
+                    "nonce" : "0xade69926a8521ece",
                     "number" : "0x01",
-                    "parentHash" : "a763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91f",
-                    "receiptTrie" : "19435bd77b3a272c92b21d90155f81742001d3c9ac726d314a7b240bdb05521e",
-                    "stateRoot" : "9119f2ddd7c9e1aa1bf9c269c0314b42905a0c5d923c7a17f889c37ea948f547",
+                    "parentHash" : "0xa763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91f",
+                    "receiptTrie" : "0x19435bd77b3a272c92b21d90155f81742001d3c9ac726d314a7b240bdb05521e",
+                    "stateRoot" : "0x9119f2ddd7c9e1aa1bf9c269c0314b42905a0c5d923c7a17f889c37ea948f547",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0a763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09119f2ddd7c9e1aa1bf9c269c0314b42905a0c5d923c7a17f889c37ea948f547a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a019435bd77b3a272c92b21d90155f81742001d3c9ac726d314a7b240bdb05521eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808232ca8203e880a0b2dad1cc38a5a2e627b5878801511086945d0677b34d87c932998091890abef088abfe48667021de7af862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a0a763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09119f2ddd7c9e1aa1bf9c269c0314b42905a0c5d923c7a17f889c37ea948f547a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a019435bd77b3a272c92b21d90155f81742001d3c9ac726d314a7b240bdb05521eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808232ca8203e880a07152ae0a9aa4ba5c12d4403dd63f4767fbd16d2aac37a5cd2f3079d24bf7cafc88ade69926a8521ecef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,44 +44,44 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "a763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "085a8f43bfbb682174829da99e628621026e15de8bb1c3bc241b28dff2841d94",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x085a8f43bfbb682174829da99e628621026e15de8bb1c3bc241b28dff2841d94",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0085a8f43bfbb682174829da99e628621026e15de8bb1c3bc241b28dff2841d94a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "39b77068f80f625a3c2d5a98e2f9f8c0f2bfb50b5fabac543db6f12a63b23100",
+        "lastblockhash" : "0x601723eb8f91cf36ef0b2030980725da8e5b72f4812ec7da1a0b0d406b8c5658",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f432ca",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4dd36",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -84,14 +89,14 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
@@ -99,9 +104,9 @@
                     "0x00" : "0x01"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -109,37 +114,42 @@
             }
         }
     },
-    "NonZeroValue_SELFDESTRUCT_ToOneStorageKey_d0g0v0_EIP158" : {
+    "NonZeroValue_SUICIDE_ToOneStorageKey_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x697b",
-                    "hash" : "973fe82865c30fb3223284e21f97f01dfb39cbde0327f04344e7c32a41bccd7b",
-                    "mixHash" : "1aa3efc344522379cc942c7d3790aeae673394c2910bbb2f9fb5041df4d0b7e4",
-                    "nonce" : "08802078d14401f7",
+                    "hash" : "0xa3181353d9c6031535ed49b177dce4a9c65707492fde61880178c6e3ef1d5b47",
+                    "mixHash" : "0x9cc120ed23838cc7f34fde8c4525f307ac61e0786df43e2ca9f1f5ca6e44a171",
+                    "nonce" : "0x3261ad2babe37bf4",
                     "number" : "0x01",
-                    "parentHash" : "a763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91f",
-                    "receiptTrie" : "57a41c758b8a74416949b139dd60acba416c1f7aa8e13e51f79448763b01eeb3",
-                    "stateRoot" : "31e12df32e9cc83f5a61225e5bce6b935424b72ed136bde4d62ee8b40eeeb85a",
+                    "parentHash" : "0xa763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91f",
+                    "receiptTrie" : "0x57a41c758b8a74416949b139dd60acba416c1f7aa8e13e51f79448763b01eeb3",
+                    "stateRoot" : "0x31e12df32e9cc83f5a61225e5bce6b935424b72ed136bde4d62ee8b40eeeb85a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0a763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa031e12df32e9cc83f5a61225e5bce6b935424b72ed136bde4d62ee8b40eeeb85aa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a057a41c758b8a74416949b139dd60acba416c1f7aa8e13e51f79448763b01eeb3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a01aa3efc344522379cc942c7d3790aeae673394c2910bbb2f9fb5041df4d0b7e48808802078d14401f7f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a0a763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa031e12df32e9cc83f5a61225e5bce6b935424b72ed136bde4d62ee8b40eeeb85aa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a057a41c758b8a74416949b139dd60acba416c1f7aa8e13e51f79448763b01eeb3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a09cc120ed23838cc7f34fde8c4525f307ac61e0786df43e2ca9f1f5ca6e44a171883261ad2babe37bf4f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -149,44 +159,44 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "a763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "085a8f43bfbb682174829da99e628621026e15de8bb1c3bc241b28dff2841d94",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x085a8f43bfbb682174829da99e628621026e15de8bb1c3bc241b28dff2841d94",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0085a8f43bfbb682174829da99e628621026e15de8bb1c3bc241b28dff2841d94a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "973fe82865c30fb3223284e21f97f01dfb39cbde0327f04344e7c32a41bccd7b",
+        "lastblockhash" : "0xa3181353d9c6031535ed49b177dce4a9c65707492fde61880178c6e3ef1d5b47",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4697b",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4a685",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -194,14 +204,14 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
@@ -209,9 +219,9 @@
                     "0x00" : "0x01"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -219,37 +229,42 @@
             }
         }
     },
-    "NonZeroValue_SELFDESTRUCT_ToOneStorageKey_d0g0v0_Frontier" : {
+    "NonZeroValue_SUICIDE_ToOneStorageKey_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x2906",
-                    "hash" : "d0dee47f44196e06af682515e04857db00a625b814cb0153866cd44286d41f12",
-                    "mixHash" : "e65b6ba81c40fe912bf527b0d584ec3ccca68f503a83c68409f9666186603c9b",
-                    "nonce" : "d06ebca5cdfba296",
+                    "hash" : "0x74d947accd3cae0292033b0703284fbb91d9c0da5b5f0b00fa52437aff8148f2",
+                    "mixHash" : "0x1a0c3c806c521b3ffc64e6450281c79d1fb8b8067806faff6167b0a388cffddb",
+                    "nonce" : "0xba4bb5db06ecde88",
                     "number" : "0x01",
-                    "parentHash" : "a763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91f",
-                    "receiptTrie" : "28d55fafd2d9b51e2734da7ba395149da024cc00ee11e6a2de22d6cead6ef485",
-                    "stateRoot" : "9bc4201f3b83b4e4c5c748c7a3b1f152e49bf82c7b280f2a12be36d58624f415",
+                    "parentHash" : "0xa763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91f",
+                    "receiptTrie" : "0x28d55fafd2d9b51e2734da7ba395149da024cc00ee11e6a2de22d6cead6ef485",
+                    "stateRoot" : "0x9bc4201f3b83b4e4c5c748c7a3b1f152e49bf82c7b280f2a12be36d58624f415",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0a763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bc4201f3b83b4e4c5c748c7a3b1f152e49bf82c7b280f2a12be36d58624f415a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a028d55fafd2d9b51e2734da7ba395149da024cc00ee11e6a2de22d6cead6ef485b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a0e65b6ba81c40fe912bf527b0d584ec3ccca68f503a83c68409f9666186603c9b88d06ebca5cdfba296f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a0a763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bc4201f3b83b4e4c5c748c7a3b1f152e49bf82c7b280f2a12be36d58624f415a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a028d55fafd2d9b51e2734da7ba395149da024cc00ee11e6a2de22d6cead6ef485b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a01a0c3c806c521b3ffc64e6450281c79d1fb8b8067806faff6167b0a388cffddb88ba4bb5db06ecde88f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -259,44 +274,44 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "a763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "085a8f43bfbb682174829da99e628621026e15de8bb1c3bc241b28dff2841d94",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x085a8f43bfbb682174829da99e628621026e15de8bb1c3bc241b28dff2841d94",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0085a8f43bfbb682174829da99e628621026e15de8bb1c3bc241b28dff2841d94a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d0dee47f44196e06af682515e04857db00a625b814cb0153866cd44286d41f12",
+        "lastblockhash" : "0x74d947accd3cae0292033b0703284fbb91d9c0da5b5f0b00fa52437aff8148f2",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f42906",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4e6fa",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -304,14 +319,14 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
@@ -319,9 +334,9 @@
                     "0x00" : "0x01"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -329,37 +344,42 @@
             }
         }
     },
-    "NonZeroValue_SELFDESTRUCT_ToOneStorageKey_d0g0v0_Homestead" : {
+    "NonZeroValue_SUICIDE_ToOneStorageKey_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x2906",
-                    "hash" : "768d05e0efc7b53fa9552d021dc56e8715b494d32db1a93a05137e13dd0a8325",
-                    "mixHash" : "614bc1c0712bde26785d3071182b50f957b67afb1dea6a395cde158628eea085",
-                    "nonce" : "152d3d7ee5fc46a6",
+                    "hash" : "0x7390deb55e5d644bea524d4ef9a2c808e7118f9a01372405bdc6b631611716a8",
+                    "mixHash" : "0x199dad5af51fd9ea182ffe61503ed909e6fa6e17c31736faef7dbde1467bd648",
+                    "nonce" : "0x4038d8cb073bb90e",
                     "number" : "0x01",
-                    "parentHash" : "a763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91f",
-                    "receiptTrie" : "28d55fafd2d9b51e2734da7ba395149da024cc00ee11e6a2de22d6cead6ef485",
-                    "stateRoot" : "9bc4201f3b83b4e4c5c748c7a3b1f152e49bf82c7b280f2a12be36d58624f415",
+                    "parentHash" : "0xa763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91f",
+                    "receiptTrie" : "0x28d55fafd2d9b51e2734da7ba395149da024cc00ee11e6a2de22d6cead6ef485",
+                    "stateRoot" : "0x9bc4201f3b83b4e4c5c748c7a3b1f152e49bf82c7b280f2a12be36d58624f415",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0a763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bc4201f3b83b4e4c5c748c7a3b1f152e49bf82c7b280f2a12be36d58624f415a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a028d55fafd2d9b51e2734da7ba395149da024cc00ee11e6a2de22d6cead6ef485b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a0614bc1c0712bde26785d3071182b50f957b67afb1dea6a395cde158628eea08588152d3d7ee5fc46a6f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a0a763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bc4201f3b83b4e4c5c748c7a3b1f152e49bf82c7b280f2a12be36d58624f415a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a028d55fafd2d9b51e2734da7ba395149da024cc00ee11e6a2de22d6cead6ef485b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a0199dad5af51fd9ea182ffe61503ed909e6fa6e17c31736faef7dbde1467bd648884038d8cb073bb90ef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -369,44 +389,166 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "a763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "085a8f43bfbb682174829da99e628621026e15de8bb1c3bc241b28dff2841d94",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x085a8f43bfbb682174829da99e628621026e15de8bb1c3bc241b28dff2841d94",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0085a8f43bfbb682174829da99e628621026e15de8bb1c3bc241b28dff2841d94a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "768d05e0efc7b53fa9552d021dc56e8715b494d32db1a93a05137e13dd0a8325",
+        "lastblockhash" : "0x7390deb55e5d644bea524d4ef9a2c808e7118f9a01372405bdc6b631611716a8",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f42906",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4e6fa",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        }
+    },
+    "NonZeroValue_SUICIDE_ToOneStorageKey_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x697b",
+                    "hash" : "0xdc837933483baf632794f2e502e37f829d775cdc6bd9192345cde46b3a0b2ed4",
+                    "mixHash" : "0x8fd3b40f56db85ee0baf76d8906ce5ebfa7985f52388c027fd852822d0b7b4d5",
+                    "nonce" : "0xc73ac42edeb02e5c",
+                    "number" : "0x01",
+                    "parentHash" : "0xa763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91f",
+                    "receiptTrie" : "0x11b9a3af527495821ab161c2237f35f6a032d0dc5e9ee404f60ba12f9b7c26a9",
+                    "stateRoot" : "0xe52a09773169b71eee450409b10d0eac44fa23c0de651b9afa5c72e89923ce0c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a0a763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e52a09773169b71eee450409b10d0eac44fa23c0de651b9afa5c72e89923ce0ca059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a011b9a3af527495821ab161c2237f35f6a032d0dc5e9ee404f60ba12f9b7c26a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a08fd3b40f56db85ee0baf76d8906ce5ebfa7985f52388c027fd852822d0b7b4d588c73ac42edeb02e5cf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xa763e3c0a69d62bd43ae1f1c7bef47450ce3549236d1892ae79d58d822d2c91f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x085a8f43bfbb682174829da99e628621026e15de8bb1c3bc241b28dff2841d94",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0085a8f43bfbb682174829da99e628621026e15de8bb1c3bc241b28dff2841d94a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdc837933483baf632794f2e502e37f829d775cdc6bd9192345cde46b3a0b2ed4",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4697b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4a685",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -414,14 +556,14 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
@@ -429,9 +571,9 @@
                     "0x00" : "0x01"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_d0g0v0.json
index 6b30249d5..8c532a050 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_d0g0v0.json
@@ -1,35 +1,40 @@
 {
-    "NonZeroValue_SELFDESTRUCT_d0g0v0_EIP150" : {
+    "NonZeroValue_SUICIDE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_SUICIDE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x697b",
-                    "hash" : "d2d16802739c4b6aca801bcbb20f0bcd4b9ba14dae821fc4b74852bcb06f8d41",
-                    "mixHash" : "4af2732474b32fdb5afdf4bad6e00c5cdda3283132ca0400fc2219d3990e899e",
-                    "nonce" : "3371d6f819f500fe",
+                    "hash" : "0x0f53c76f16db9ca7db9fcf33d80706903094a18c1a546b098b441a46560ad338",
+                    "mixHash" : "0x5f2d119c2fb1ee150fe32af92d0cea8c9fced1944bcb7c30fa31444bbd500907",
+                    "nonce" : "0xd80099e5c1578664",
                     "number" : "0x01",
-                    "parentHash" : "4b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3",
-                    "receiptTrie" : "2310d54366a7465c02d9f29bd2b93c38168bb3d837add2f2192146bd0ed34717",
-                    "stateRoot" : "c818004ab0c3303f2facae961664c7f0cdd379d270bebb049ec8e7ef9efaefad",
+                    "parentHash" : "0x4b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3",
+                    "receiptTrie" : "0x2310d54366a7465c02d9f29bd2b93c38168bb3d837add2f2192146bd0ed34717",
+                    "stateRoot" : "0xc818004ab0c3303f2facae961664c7f0cdd379d270bebb049ec8e7ef9efaefad",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a04b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c818004ab0c3303f2facae961664c7f0cdd379d270bebb049ec8e7ef9efaefada059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a02310d54366a7465c02d9f29bd2b93c38168bb3d837add2f2192146bd0ed34717b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a04af2732474b32fdb5afdf4bad6e00c5cdda3283132ca0400fc2219d3990e899e883371d6f819f500fef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a04b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c818004ab0c3303f2facae961664c7f0cdd379d270bebb049ec8e7ef9efaefada059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a02310d54366a7465c02d9f29bd2b93c38168bb3d837add2f2192146bd0ed34717b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a05f2d119c2fb1ee150fe32af92d0cea8c9fced1944bcb7c30fa31444bbd50090788d80099e5c1578664f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,58 +44,58 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "4b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a788ae3f2d287246a0563f51f77d6eb97d0c2f0393a01f9d0558b56d1184add0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa788ae3f2d287246a0563f51f77d6eb97d0c2f0393a01f9d0558b56d1184add0",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a788ae3f2d287246a0563f51f77d6eb97d0c2f0393a01f9d0558b56d1184add0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d2d16802739c4b6aca801bcbb20f0bcd4b9ba14dae821fc4b74852bcb06f8d41",
+        "lastblockhash" : "0x0f53c76f16db9ca7db9fcf33d80706903094a18c1a546b098b441a46560ad338",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4697b",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4a685",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
@@ -99,37 +104,42 @@
             }
         }
     },
-    "NonZeroValue_SELFDESTRUCT_d0g0v0_EIP158" : {
+    "NonZeroValue_SUICIDE_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_SUICIDE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x697b",
-                    "hash" : "8f27ee9245b7c9621c26faa56e1915fabf7aa27c7a34f0b7e4816599f896ac13",
-                    "mixHash" : "8e3467f3054a4c59d3a583856ba71b1961bcc2719c4f1813c0d847121f03ff99",
-                    "nonce" : "c8129e9223c8975f",
+                    "hash" : "0xb47a4f488636b792a5523dc2e9d55d82764900df2fb371262461fe1c6da1f2f6",
+                    "mixHash" : "0x1fd80d14236762506270e335d88a1485e885386fc8509b3c816bbec6e2818332",
+                    "nonce" : "0xac2289283efd1d25",
                     "number" : "0x01",
-                    "parentHash" : "4b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3",
-                    "receiptTrie" : "2310d54366a7465c02d9f29bd2b93c38168bb3d837add2f2192146bd0ed34717",
-                    "stateRoot" : "c818004ab0c3303f2facae961664c7f0cdd379d270bebb049ec8e7ef9efaefad",
+                    "parentHash" : "0x4b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3",
+                    "receiptTrie" : "0x2310d54366a7465c02d9f29bd2b93c38168bb3d837add2f2192146bd0ed34717",
+                    "stateRoot" : "0xc818004ab0c3303f2facae961664c7f0cdd379d270bebb049ec8e7ef9efaefad",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a04b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c818004ab0c3303f2facae961664c7f0cdd379d270bebb049ec8e7ef9efaefada059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a02310d54366a7465c02d9f29bd2b93c38168bb3d837add2f2192146bd0ed34717b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a08e3467f3054a4c59d3a583856ba71b1961bcc2719c4f1813c0d847121f03ff9988c8129e9223c8975ff862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a04b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c818004ab0c3303f2facae961664c7f0cdd379d270bebb049ec8e7ef9efaefada059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a02310d54366a7465c02d9f29bd2b93c38168bb3d837add2f2192146bd0ed34717b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a01fd80d14236762506270e335d88a1485e885386fc8509b3c816bbec6e281833288ac2289283efd1d25f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -139,58 +149,58 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "4b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a788ae3f2d287246a0563f51f77d6eb97d0c2f0393a01f9d0558b56d1184add0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa788ae3f2d287246a0563f51f77d6eb97d0c2f0393a01f9d0558b56d1184add0",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a788ae3f2d287246a0563f51f77d6eb97d0c2f0393a01f9d0558b56d1184add0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8f27ee9245b7c9621c26faa56e1915fabf7aa27c7a34f0b7e4816599f896ac13",
+        "lastblockhash" : "0xb47a4f488636b792a5523dc2e9d55d82764900df2fb371262461fe1c6da1f2f6",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4697b",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4a685",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
@@ -199,37 +209,42 @@
             }
         }
     },
-    "NonZeroValue_SELFDESTRUCT_d0g0v0_Frontier" : {
+    "NonZeroValue_SUICIDE_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_SUICIDE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x2906",
-                    "hash" : "0397ee09bdc095336676c2992c2200de6074cad0aed970a9e280ab8a46a706e6",
-                    "mixHash" : "eb37b5abac66db64c065fadb664a79f161cec222000514259f16077f019f1a47",
-                    "nonce" : "7ad99382a441920c",
+                    "hash" : "0x25a7557715a7f61010e097cd2a18e56f6568d861af78f3e5f4d601d209b3fd21",
+                    "mixHash" : "0x64361534fbf478080c2188ff56815caf2f2723dfa67e0179423547f656f8e8b4",
+                    "nonce" : "0xb37446ed106e2b81",
                     "number" : "0x01",
-                    "parentHash" : "4b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3",
-                    "receiptTrie" : "6e479760edf098dc1ea0823c7e9cf4184af552b6b2aca01fc3810fdeb36caf60",
-                    "stateRoot" : "da0a9513c292c9b69e7b4463a250e71a8101763f45a11d3c5d2cefc902a14dae",
+                    "parentHash" : "0x4b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3",
+                    "receiptTrie" : "0x6e479760edf098dc1ea0823c7e9cf4184af552b6b2aca01fc3810fdeb36caf60",
+                    "stateRoot" : "0xda0a9513c292c9b69e7b4463a250e71a8101763f45a11d3c5d2cefc902a14dae",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a04b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da0a9513c292c9b69e7b4463a250e71a8101763f45a11d3c5d2cefc902a14daea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a06e479760edf098dc1ea0823c7e9cf4184af552b6b2aca01fc3810fdeb36caf60b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a0eb37b5abac66db64c065fadb664a79f161cec222000514259f16077f019f1a47887ad99382a441920cf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a04b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da0a9513c292c9b69e7b4463a250e71a8101763f45a11d3c5d2cefc902a14daea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a06e479760edf098dc1ea0823c7e9cf4184af552b6b2aca01fc3810fdeb36caf60b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a064361534fbf478080c2188ff56815caf2f2723dfa67e0179423547f656f8e8b488b37446ed106e2b81f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -239,58 +254,58 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "4b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a788ae3f2d287246a0563f51f77d6eb97d0c2f0393a01f9d0558b56d1184add0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa788ae3f2d287246a0563f51f77d6eb97d0c2f0393a01f9d0558b56d1184add0",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a788ae3f2d287246a0563f51f77d6eb97d0c2f0393a01f9d0558b56d1184add0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0397ee09bdc095336676c2992c2200de6074cad0aed970a9e280ab8a46a706e6",
+        "lastblockhash" : "0x25a7557715a7f61010e097cd2a18e56f6568d861af78f3e5f4d601d209b3fd21",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f42906",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4e6fa",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
@@ -299,37 +314,42 @@
             }
         }
     },
-    "NonZeroValue_SELFDESTRUCT_d0g0v0_Homestead" : {
+    "NonZeroValue_SUICIDE_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_SUICIDE_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x2906",
-                    "hash" : "eaebf1028708e5aa95b45a64db141ddbfcbed3b848acbc51fab5600bcfb73325",
-                    "mixHash" : "d0b6a14878de1a0c204697004773edc0d0def772202d2fd53c74b2e70f092cbe",
-                    "nonce" : "7229dbeb75ecd6c8",
+                    "hash" : "0xc62e3011d2cd280fcf508d556bf602711281ae459d023ec4cd8db8c41f5b50a0",
+                    "mixHash" : "0x53322f99aadadc090b73dbd6d7c7c8e8dd80b701e01f9fb8077e56ce5c773fe0",
+                    "nonce" : "0x7ad5cd98b5669207",
                     "number" : "0x01",
-                    "parentHash" : "4b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3",
-                    "receiptTrie" : "6e479760edf098dc1ea0823c7e9cf4184af552b6b2aca01fc3810fdeb36caf60",
-                    "stateRoot" : "da0a9513c292c9b69e7b4463a250e71a8101763f45a11d3c5d2cefc902a14dae",
+                    "parentHash" : "0x4b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3",
+                    "receiptTrie" : "0x6e479760edf098dc1ea0823c7e9cf4184af552b6b2aca01fc3810fdeb36caf60",
+                    "stateRoot" : "0xda0a9513c292c9b69e7b4463a250e71a8101763f45a11d3c5d2cefc902a14dae",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a04b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da0a9513c292c9b69e7b4463a250e71a8101763f45a11d3c5d2cefc902a14daea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a06e479760edf098dc1ea0823c7e9cf4184af552b6b2aca01fc3810fdeb36caf60b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a0d0b6a14878de1a0c204697004773edc0d0def772202d2fd53c74b2e70f092cbe887229dbeb75ecd6c8f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a04b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da0a9513c292c9b69e7b4463a250e71a8101763f45a11d3c5d2cefc902a14daea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a06e479760edf098dc1ea0823c7e9cf4184af552b6b2aca01fc3810fdeb36caf60b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a053322f99aadadc090b73dbd6d7c7c8e8dd80b701e01f9fb8077e56ce5c773fe0887ad5cd98b5669207f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
                         "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -339,58 +359,170 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "4b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a788ae3f2d287246a0563f51f77d6eb97d0c2f0393a01f9d0558b56d1184add0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa788ae3f2d287246a0563f51f77d6eb97d0c2f0393a01f9d0558b56d1184add0",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a788ae3f2d287246a0563f51f77d6eb97d0c2f0393a01f9d0558b56d1184add0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "eaebf1028708e5aa95b45a64db141ddbfcbed3b848acbc51fab5600bcfb73325",
+        "lastblockhash" : "0xc62e3011d2cd280fcf508d556bf602711281ae459d023ec4cd8db8c41f5b50a0",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f42906",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4e6fa",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NonZeroValue_SUICIDE_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_SUICIDE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x697b",
+                    "hash" : "0x13e5efbe4bda3e991c7b90e20aa01b6bbe62c73d92ec0dd1f535a2b8ff61e723",
+                    "mixHash" : "0x96d514e62b7a4c92fcf29622965054d42db707ee361bbd7ca2961acf5eee3d33",
+                    "nonce" : "0xe3ab17648c231ce9",
+                    "number" : "0x01",
+                    "parentHash" : "0x4b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3",
+                    "receiptTrie" : "0x11b9a3af527495821ab161c2237f35f6a032d0dc5e9ee404f60ba12f9b7c26a9",
+                    "stateRoot" : "0x7f38c17ec584cc7acdf0baec3467ab6516307afdddf83a31f876b7d60a4ad322",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a04b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f38c17ec584cc7acdf0baec3467ab6516307afdddf83a31f876b7d60a4ad322a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a011b9a3af527495821ab161c2237f35f6a032d0dc5e9ee404f60ba12f9b7c26a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a096d514e62b7a4c92fcf29622965054d42db707ee361bbd7ca2961acf5eee3d3388e3ab17648c231ce9f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x4b97138f32e4c84bb53ad9c859ad435becaa91b68dbd39e27b395ae2ea7f79e3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa788ae3f2d287246a0563f51f77d6eb97d0c2f0393a01f9d0558b56d1184add0",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a788ae3f2d287246a0563f51f77d6eb97d0c2f0393a01f9d0558b56d1184add0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x13e5efbe4bda3e991c7b90e20aa01b6bbe62c73d92ec0dd1f535a2b8ff61e723",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4697b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4a685",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty_d0g0v0.json
index b3c40aefa..c7ce3acd2 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "NonZeroValue_TransactionCALL_ToEmpty_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5208",
-                    "hash" : "348c64ef3a7e2a4e5f2f275539434137cc8e00d785007457f1962d94111d4645",
-                    "mixHash" : "722b786739dd76dfa729bf0389c9e76d1e9dd06f297f2b9829ed0b0621e61604",
-                    "nonce" : "8bbb3e11039f464f",
+                    "hash" : "0x354a82a179f317c6759690b2da787088bc74885dc51a5e4eaec0f878b55355e6",
+                    "mixHash" : "0x33c7082248247fa8891bea64ab2ee89962a44ec760686890c0ebe05ad69d7f46",
+                    "nonce" : "0xcaef83389c9a4878",
                     "number" : "0x01",
-                    "parentHash" : "b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
-                    "receiptTrie" : "87e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8",
-                    "stateRoot" : "80f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2",
+                    "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+                    "receiptTrie" : "0x87e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8",
+                    "stateRoot" : "0x80f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a087e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a0722b786739dd76dfa729bf0389c9e76d1e9dd06f297f2b9829ed0b0621e61604888bbb3e11039f464ff862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
+                "rlp" : "0xf9025ff901f7a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a087e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a033c7082248247fa8891bea64ab2ee89962a44ec760686890c0ebe05ad69d7f4688caef83389c9a4878f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6ce",
                         "s" : "0x18d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -39,60 +44,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "348c64ef3a7e2a4e5f2f275539434137cc8e00d785007457f1962d94111d4645",
+        "lastblockhash" : "0x354a82a179f317c6759690b2da787088bc74885dc51a5e4eaec0f878b55355e6",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45208",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4bdf7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -100,36 +105,41 @@
         }
     },
     "NonZeroValue_TransactionCALL_ToEmpty_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5208",
-                    "hash" : "50c05161f023b4cc0ac2a3cc9d1be285e8b0dc41010dd75a8ed7154e23c119bc",
-                    "mixHash" : "87fe5ead75d9680c65358f92c9094bcc70d35b518a6051ab77077d4c33d85e21",
-                    "nonce" : "13c014eaafef506d",
+                    "hash" : "0x42717c3ec5b77b6865bedacf8153b488ae6ef1e5af756acbf46247e239a790f8",
+                    "mixHash" : "0x252c004ed89df1893686f132802f6638efe93a0e1aa02c5d223094c7a8c379cb",
+                    "nonce" : "0x65012edb21ca6f5d",
                     "number" : "0x01",
-                    "parentHash" : "b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
-                    "receiptTrie" : "87e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8",
-                    "stateRoot" : "80f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2",
+                    "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+                    "receiptTrie" : "0x87e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8",
+                    "stateRoot" : "0x80f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a087e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a087fe5ead75d9680c65358f92c9094bcc70d35b518a6051ab77077d4c33d85e218813c014eaafef506df862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
+                "rlp" : "0xf9025ff901f7a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a087e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a0252c004ed89df1893686f132802f6638efe93a0e1aa02c5d223094c7a8c379cb8865012edb21ca6f5df862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6ce",
                         "s" : "0x18d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -139,60 +149,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "50c05161f023b4cc0ac2a3cc9d1be285e8b0dc41010dd75a8ed7154e23c119bc",
+        "lastblockhash" : "0x42717c3ec5b77b6865bedacf8153b488ae6ef1e5af756acbf46247e239a790f8",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45208",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4bdf7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -200,36 +210,41 @@
         }
     },
     "NonZeroValue_TransactionCALL_ToEmpty_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5208",
-                    "hash" : "3cf90f7f5e998355df708b511241d44ad19b26502d8c36ae1b96c1d1f38914f4",
-                    "mixHash" : "46aca699ef9675b623468bf763984f0c2fbc607df62924aaac4d786ac4169fdb",
-                    "nonce" : "f1500af499a468d9",
+                    "hash" : "0x1c1d79b42f0585730ad87a7ac3cc3234b5574126df5e64904bc65d71ff7e74e1",
+                    "mixHash" : "0xa889f06a1b3d81588906bb2f5bf44600478f7326b2020fa0a0313f9873b4a90e",
+                    "nonce" : "0x96b13a42ced4a292",
                     "number" : "0x01",
-                    "parentHash" : "b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
-                    "receiptTrie" : "87e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8",
-                    "stateRoot" : "80f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2",
+                    "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+                    "receiptTrie" : "0x87e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8",
+                    "stateRoot" : "0x80f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a087e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a046aca699ef9675b623468bf763984f0c2fbc607df62924aaac4d786ac4169fdb88f1500af499a468d9f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
+                "rlp" : "0xf9025ff901f7a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a087e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a0a889f06a1b3d81588906bb2f5bf44600478f7326b2020fa0a0313f9873b4a90e8896b13a42ced4a292f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6ce",
                         "s" : "0x18d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -239,60 +254,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3cf90f7f5e998355df708b511241d44ad19b26502d8c36ae1b96c1d1f38914f4",
+        "lastblockhash" : "0x1c1d79b42f0585730ad87a7ac3cc3234b5574126df5e64904bc65d71ff7e74e1",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45208",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4bdf7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -300,36 +315,41 @@
         }
     },
     "NonZeroValue_TransactionCALL_ToEmpty_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5208",
-                    "hash" : "9184444ad4bcf0585ab12efc7966b81420f6cca50846bc38e22e18a1b2b96d5f",
-                    "mixHash" : "a37cc4b04f7676e5a358c4c8d75f504a027e0c008469b0207c16bdb40fdf1b8a",
-                    "nonce" : "0302240a4f5419e4",
+                    "hash" : "0x9a37ecad0f2f427a95feb362aecc9702e50d4fb1433a278a547fd23a46bbdb77",
+                    "mixHash" : "0xb66434e9525ffd8ea31453065cedfa3364641c961d61ed9fcd2a63260368b199",
+                    "nonce" : "0x7686191c7855a3c0",
                     "number" : "0x01",
-                    "parentHash" : "b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
-                    "receiptTrie" : "87e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8",
-                    "stateRoot" : "80f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2",
+                    "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+                    "receiptTrie" : "0x87e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8",
+                    "stateRoot" : "0x80f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a087e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a0a37cc4b04f7676e5a358c4c8d75f504a027e0c008469b0207c16bdb40fdf1b8a880302240a4f5419e4f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
+                "rlp" : "0xf9025ff901f7a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a087e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a0b66434e9525ffd8ea31453065cedfa3364641c961d61ed9fcd2a63260368b199887686191c7855a3c0f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6ce",
                         "s" : "0x18d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -339,60 +359,172 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9184444ad4bcf0585ab12efc7966b81420f6cca50846bc38e22e18a1b2b96d5f",
+        "lastblockhash" : "0x9a37ecad0f2f427a95feb362aecc9702e50d4fb1433a278a547fd23a46bbdb77",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f45208",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4bdf7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NonZeroValue_TransactionCALL_ToEmpty_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x5208",
+                    "hash" : "0x3453910a445e89dfd175e7a3ca9e733f91efab9b04957b5567a2435d68a0a23a",
+                    "mixHash" : "0x3b586d6aa6c8bb75642181c8405a31691ec86682f530c75e2b9eb63f9137e744",
+                    "nonce" : "0x57642ecbbb53c7a8",
+                    "number" : "0x01",
+                    "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+                    "receiptTrie" : "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2",
+                    "stateRoot" : "0xe497936dea154cd010969fc600b291545660a95847ac541ba20e35592357063e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e497936dea154cd010969fc600b291545660a95847ac541ba20e35592357063ea0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a0056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a03b586d6aa6c8bb75642181c8405a31691ec86682f530c75e2b9eb63f9137e7448857642ecbbb53c7a8f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6ce",
+                        "s" : "0x18d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3453910a445e89dfd175e7a3ca9e733f91efab9b04957b5567a2435d68a0a23a",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45208",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4bdf7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalance.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalance_d0g0v0.json
index b6e105151..700db0ef8 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalance.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalance_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "NonZeroValue_TransactionCALL_ToNonNonZeroBalance_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5208",
-                    "hash" : "4ac685d08ad0afee73115560404c58773c84ae8ac9a1d652b4111ed38363f211",
-                    "mixHash" : "293910c0a78c7dd1f8350e9a96b0c22153e0c73153663f06d2b847c4e0e3c265",
-                    "nonce" : "e6a82fa12bc6221d",
+                    "hash" : "0xdb75164372cda432fe0be986a4357ba81ebc62dbdfa23cae4ccefb8e62313115",
+                    "mixHash" : "0x383be318f8483fcee5fdeee1da0057f4ec22f70d6ca30f72de495e603bc080b3",
+                    "nonce" : "0x304c09b591b5424b",
                     "number" : "0x01",
-                    "parentHash" : "e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
-                    "receiptTrie" : "45005b2ea53634a8cda5571970c2a03b28d3331b2095ac2e4549cbcfbe269293",
-                    "stateRoot" : "4b8f23557d60d3f013ced6a36908c305755df9801328dd468dd55fab72734608",
+                    "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+                    "receiptTrie" : "0x45005b2ea53634a8cda5571970c2a03b28d3331b2095ac2e4549cbcfbe269293",
+                    "stateRoot" : "0x4b8f23557d60d3f013ced6a36908c305755df9801328dd468dd55fab72734608",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b8f23557d60d3f013ced6a36908c305755df9801328dd468dd55fab72734608a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a045005b2ea53634a8cda5571970c2a03b28d3331b2095ac2e4549cbcfbe269293b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a0293910c0a78c7dd1f8350e9a96b0c22153e0c73153663f06d2b847c4e0e3c26588e6a82fa12bc6221df862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
+                "rlp" : "0xf9025ff901f7a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b8f23557d60d3f013ced6a36908c305755df9801328dd468dd55fab72734608a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a045005b2ea53634a8cda5571970c2a03b28d3331b2095ac2e4549cbcfbe269293b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a0383be318f8483fcee5fdeee1da0057f4ec22f70d6ca30f72de495e603bc080b388304c09b591b5424bf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6ce",
                         "s" : "0x18d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -39,60 +44,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4ac685d08ad0afee73115560404c58773c84ae8ac9a1d652b4111ed38363f211",
+        "lastblockhash" : "0xdb75164372cda432fe0be986a4357ba81ebc62dbdfa23cae4ccefb8e62313115",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45208",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4bdf7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x65",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -100,36 +105,41 @@
         }
     },
     "NonZeroValue_TransactionCALL_ToNonNonZeroBalance_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5208",
-                    "hash" : "43f47ba4d0ab0c992be8ff7d195865f86348845da6c0fe17dac06b86a63d091b",
-                    "mixHash" : "da60c34fe635571367c28faacc370ced2d564c781dc2c3b78dcd24a0b6beb8bf",
-                    "nonce" : "5945389033396630",
+                    "hash" : "0xba9eb0ad509c4d304a2e8372866dc8b3b14077b8a9d9f57857d7200b263683e1",
+                    "mixHash" : "0x1c4e02e9d21cbc517d4b4393b6eeb8fca6cc80e2c9a5e395947c3c1d01310777",
+                    "nonce" : "0x2487cafb8743dc5d",
                     "number" : "0x01",
-                    "parentHash" : "e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
-                    "receiptTrie" : "45005b2ea53634a8cda5571970c2a03b28d3331b2095ac2e4549cbcfbe269293",
-                    "stateRoot" : "4b8f23557d60d3f013ced6a36908c305755df9801328dd468dd55fab72734608",
+                    "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+                    "receiptTrie" : "0x45005b2ea53634a8cda5571970c2a03b28d3331b2095ac2e4549cbcfbe269293",
+                    "stateRoot" : "0x4b8f23557d60d3f013ced6a36908c305755df9801328dd468dd55fab72734608",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b8f23557d60d3f013ced6a36908c305755df9801328dd468dd55fab72734608a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a045005b2ea53634a8cda5571970c2a03b28d3331b2095ac2e4549cbcfbe269293b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a0da60c34fe635571367c28faacc370ced2d564c781dc2c3b78dcd24a0b6beb8bf885945389033396630f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
+                "rlp" : "0xf9025ff901f7a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b8f23557d60d3f013ced6a36908c305755df9801328dd468dd55fab72734608a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a045005b2ea53634a8cda5571970c2a03b28d3331b2095ac2e4549cbcfbe269293b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a01c4e02e9d21cbc517d4b4393b6eeb8fca6cc80e2c9a5e395947c3c1d01310777882487cafb8743dc5df862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6ce",
                         "s" : "0x18d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -139,60 +149,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "43f47ba4d0ab0c992be8ff7d195865f86348845da6c0fe17dac06b86a63d091b",
+        "lastblockhash" : "0xba9eb0ad509c4d304a2e8372866dc8b3b14077b8a9d9f57857d7200b263683e1",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45208",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4bdf7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x65",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -200,36 +210,41 @@
         }
     },
     "NonZeroValue_TransactionCALL_ToNonNonZeroBalance_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5208",
-                    "hash" : "7befe62ce87500fa78634dca24f7ccb4fcca3b6331a80eedaf2c03e3f33ccfed",
-                    "mixHash" : "de8bb87a88a929687ba17e8646cf4d1f86fbc88f04590a81b3400096eb1c82f7",
-                    "nonce" : "fd369e5dfcc49f89",
+                    "hash" : "0x837d94f92f14aad4a39bdea2ccce93f8529c9bfa2cd694cf87d2b2bdb3136731",
+                    "mixHash" : "0x0f0a30795d96edcd9f57716eae89a12c9120702a2c3e64939fa3e0f48941ac75",
+                    "nonce" : "0x40f0c99db7d5a67d",
                     "number" : "0x01",
-                    "parentHash" : "e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
-                    "receiptTrie" : "45005b2ea53634a8cda5571970c2a03b28d3331b2095ac2e4549cbcfbe269293",
-                    "stateRoot" : "4b8f23557d60d3f013ced6a36908c305755df9801328dd468dd55fab72734608",
+                    "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+                    "receiptTrie" : "0x45005b2ea53634a8cda5571970c2a03b28d3331b2095ac2e4549cbcfbe269293",
+                    "stateRoot" : "0x4b8f23557d60d3f013ced6a36908c305755df9801328dd468dd55fab72734608",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b8f23557d60d3f013ced6a36908c305755df9801328dd468dd55fab72734608a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a045005b2ea53634a8cda5571970c2a03b28d3331b2095ac2e4549cbcfbe269293b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a0de8bb87a88a929687ba17e8646cf4d1f86fbc88f04590a81b3400096eb1c82f788fd369e5dfcc49f89f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
+                "rlp" : "0xf9025ff901f7a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b8f23557d60d3f013ced6a36908c305755df9801328dd468dd55fab72734608a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a045005b2ea53634a8cda5571970c2a03b28d3331b2095ac2e4549cbcfbe269293b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a00f0a30795d96edcd9f57716eae89a12c9120702a2c3e64939fa3e0f48941ac758840f0c99db7d5a67df862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6ce",
                         "s" : "0x18d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -239,60 +254,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7befe62ce87500fa78634dca24f7ccb4fcca3b6331a80eedaf2c03e3f33ccfed",
+        "lastblockhash" : "0x837d94f92f14aad4a39bdea2ccce93f8529c9bfa2cd694cf87d2b2bdb3136731",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45208",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4bdf7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x65",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -300,36 +315,41 @@
         }
     },
     "NonZeroValue_TransactionCALL_ToNonNonZeroBalance_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5208",
-                    "hash" : "37d701beabf78a5eedc506f1766713d68cb5299caf433078102995151e3796b4",
-                    "mixHash" : "3cdb9f378ed3550d915e95517dd3edf02368aec5ebf9e7adaca4cce841dd8c83",
-                    "nonce" : "05c752371f8f8b3c",
+                    "hash" : "0x45919061bcb3503e003a28760c0627b6e40a33370b26b5208929d762e02e5805",
+                    "mixHash" : "0x25d07743ce151c423c865a2fb7276ed88ac0946c127ea13b7fb0c2f58c185409",
+                    "nonce" : "0x345436baf4dbd0e2",
                     "number" : "0x01",
-                    "parentHash" : "e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
-                    "receiptTrie" : "45005b2ea53634a8cda5571970c2a03b28d3331b2095ac2e4549cbcfbe269293",
-                    "stateRoot" : "4b8f23557d60d3f013ced6a36908c305755df9801328dd468dd55fab72734608",
+                    "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+                    "receiptTrie" : "0x45005b2ea53634a8cda5571970c2a03b28d3331b2095ac2e4549cbcfbe269293",
+                    "stateRoot" : "0x4b8f23557d60d3f013ced6a36908c305755df9801328dd468dd55fab72734608",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b8f23557d60d3f013ced6a36908c305755df9801328dd468dd55fab72734608a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a045005b2ea53634a8cda5571970c2a03b28d3331b2095ac2e4549cbcfbe269293b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a03cdb9f378ed3550d915e95517dd3edf02368aec5ebf9e7adaca4cce841dd8c838805c752371f8f8b3cf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
+                "rlp" : "0xf9025ff901f7a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b8f23557d60d3f013ced6a36908c305755df9801328dd468dd55fab72734608a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a045005b2ea53634a8cda5571970c2a03b28d3331b2095ac2e4549cbcfbe269293b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a025d07743ce151c423c865a2fb7276ed88ac0946c127ea13b7fb0c2f58c18540988345436baf4dbd0e2f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6ce",
                         "s" : "0x18d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -339,60 +359,172 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "37d701beabf78a5eedc506f1766713d68cb5299caf433078102995151e3796b4",
+        "lastblockhash" : "0x45919061bcb3503e003a28760c0627b6e40a33370b26b5208929d762e02e5805",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f45208",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4bdf7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x65",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NonZeroValue_TransactionCALL_ToNonNonZeroBalance_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x5208",
+                    "hash" : "0x64c840d42b345b9aeda5b9c4f31ecf9ff66d671b12077da989c42dc488b6b135",
+                    "mixHash" : "0xa9d41a23729ca5eba8b32eea30b38a8f9e25e916969012a443c92ffb1081584b",
+                    "nonce" : "0xc06a09d1bb2a28b0",
+                    "number" : "0x01",
+                    "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+                    "receiptTrie" : "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2",
+                    "stateRoot" : "0x75f738f4425609822ddab0f71dae65a9f3d93f914bd482d8af24b8602c20c146",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa075f738f4425609822ddab0f71dae65a9f3d93f914bd482d8af24b8602c20c146a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a0056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a0a9d41a23729ca5eba8b32eea30b38a8f9e25e916969012a443c92ffb1081584b88c06a09d1bb2a28b0f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6ce",
+                        "s" : "0x18d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x64c840d42b345b9aeda5b9c4f31ecf9ff66d671b12077da989c42dc488b6b135",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45208",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4bdf7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x65",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey_d0g0v0.json
index e830cf574..e8697dc2d 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "NonZeroValue_TransactionCALL_ToOneStorageKey_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5208",
-                    "hash" : "2afaa085cf0cbbadf355256431df6178aabeac48ee0c9485a3fb5ff4cdf0b3e1",
-                    "mixHash" : "7f26971f2920791e12f5d1daf442069620259cb069fee21c995ee25f51e5bc1e",
-                    "nonce" : "432a3441d1ab8de5",
+                    "hash" : "0x9328f52a3a224ded1c02fb00fcad66583e9fe76f8e7d74a252a9e29d9744d91e",
+                    "mixHash" : "0x97118d86f3f98cf98e8e82e11209dfbb3e8d168732dcfb658cd566f95b72b590",
+                    "nonce" : "0xa8c4fda2da3a904b",
                     "number" : "0x01",
-                    "parentHash" : "1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
-                    "receiptTrie" : "0a6ce4851db328e0cc41f193cf4a9505abb0f433300f5c515f9509065346078f",
-                    "stateRoot" : "dc691530afbac5b100bff6b20fff075db8d5aabd11ac30f89f970f00f8a7a874",
+                    "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+                    "receiptTrie" : "0x0a6ce4851db328e0cc41f193cf4a9505abb0f433300f5c515f9509065346078f",
+                    "stateRoot" : "0xdc691530afbac5b100bff6b20fff075db8d5aabd11ac30f89f970f00f8a7a874",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc691530afbac5b100bff6b20fff075db8d5aabd11ac30f89f970f00f8a7a874a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a00a6ce4851db328e0cc41f193cf4a9505abb0f433300f5c515f9509065346078fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a07f26971f2920791e12f5d1daf442069620259cb069fee21c995ee25f51e5bc1e88432a3441d1ab8de5f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
+                "rlp" : "0xf9025ff901f7a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc691530afbac5b100bff6b20fff075db8d5aabd11ac30f89f970f00f8a7a874a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a00a6ce4851db328e0cc41f193cf4a9505abb0f433300f5c515f9509065346078fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a097118d86f3f98cf98e8e82e11209dfbb3e8d168732dcfb658cd566f95b72b59088a8c4fda2da3a904bf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6ce",
                         "s" : "0x18d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -39,44 +44,44 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2afaa085cf0cbbadf355256431df6178aabeac48ee0c9485a3fb5ff4cdf0b3e1",
+        "lastblockhash" : "0x9328f52a3a224ded1c02fb00fcad66583e9fe76f8e7d74a252a9e29d9744d91e",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45208",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4bdf7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -84,16 +89,16 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -102,36 +107,41 @@
         }
     },
     "NonZeroValue_TransactionCALL_ToOneStorageKey_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5208",
-                    "hash" : "7bc54a1cbbf5c80450d6336cefe7fc636f06bf903c54e7922418c7eea89c53be",
-                    "mixHash" : "91380e0508a1ba49c59b160a3f6f54062a413c467ffe5333b6af6c6f692f30e5",
-                    "nonce" : "c863cc5be458c623",
+                    "hash" : "0x1a1e473778e9d09cda1348293d30906f9c290200eb48bf54d085afd8b5bfbfd2",
+                    "mixHash" : "0xef619132bb8c19212d11793b0b52da695d085a2c782d99bec40a7f32b032891d",
+                    "nonce" : "0xd5b124ccd2cfae90",
                     "number" : "0x01",
-                    "parentHash" : "1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
-                    "receiptTrie" : "0a6ce4851db328e0cc41f193cf4a9505abb0f433300f5c515f9509065346078f",
-                    "stateRoot" : "dc691530afbac5b100bff6b20fff075db8d5aabd11ac30f89f970f00f8a7a874",
+                    "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+                    "receiptTrie" : "0x0a6ce4851db328e0cc41f193cf4a9505abb0f433300f5c515f9509065346078f",
+                    "stateRoot" : "0xdc691530afbac5b100bff6b20fff075db8d5aabd11ac30f89f970f00f8a7a874",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc691530afbac5b100bff6b20fff075db8d5aabd11ac30f89f970f00f8a7a874a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a00a6ce4851db328e0cc41f193cf4a9505abb0f433300f5c515f9509065346078fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a091380e0508a1ba49c59b160a3f6f54062a413c467ffe5333b6af6c6f692f30e588c863cc5be458c623f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
+                "rlp" : "0xf9025ff901f7a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc691530afbac5b100bff6b20fff075db8d5aabd11ac30f89f970f00f8a7a874a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a00a6ce4851db328e0cc41f193cf4a9505abb0f433300f5c515f9509065346078fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a0ef619132bb8c19212d11793b0b52da695d085a2c782d99bec40a7f32b032891d88d5b124ccd2cfae90f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6ce",
                         "s" : "0x18d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -141,44 +151,44 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7bc54a1cbbf5c80450d6336cefe7fc636f06bf903c54e7922418c7eea89c53be",
+        "lastblockhash" : "0x1a1e473778e9d09cda1348293d30906f9c290200eb48bf54d085afd8b5bfbfd2",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45208",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4bdf7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -186,16 +196,16 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -204,36 +214,41 @@
         }
     },
     "NonZeroValue_TransactionCALL_ToOneStorageKey_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5208",
-                    "hash" : "f24770d989d5f8c004bfff5e4caed85a45cd0a95924fa2a47d0f2b1c1b65102c",
-                    "mixHash" : "cc084664de97b69474d2dd439c77ca92679ea7d3448c3227c880170581d54c4d",
-                    "nonce" : "ffa3603673d4a1d5",
+                    "hash" : "0x8f5c93af3a7bc64246aab1be74d04407e18e8d89e8a28dfc097705813360cc05",
+                    "mixHash" : "0xc051c339d1f3404c272164bcc02665ebfd113f77437d70822ec1da130b54c64b",
+                    "nonce" : "0x47bee279d114779d",
                     "number" : "0x01",
-                    "parentHash" : "1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
-                    "receiptTrie" : "0a6ce4851db328e0cc41f193cf4a9505abb0f433300f5c515f9509065346078f",
-                    "stateRoot" : "dc691530afbac5b100bff6b20fff075db8d5aabd11ac30f89f970f00f8a7a874",
+                    "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+                    "receiptTrie" : "0x0a6ce4851db328e0cc41f193cf4a9505abb0f433300f5c515f9509065346078f",
+                    "stateRoot" : "0xdc691530afbac5b100bff6b20fff075db8d5aabd11ac30f89f970f00f8a7a874",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc691530afbac5b100bff6b20fff075db8d5aabd11ac30f89f970f00f8a7a874a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a00a6ce4851db328e0cc41f193cf4a9505abb0f433300f5c515f9509065346078fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a0cc084664de97b69474d2dd439c77ca92679ea7d3448c3227c880170581d54c4d88ffa3603673d4a1d5f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
+                "rlp" : "0xf9025ff901f7a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc691530afbac5b100bff6b20fff075db8d5aabd11ac30f89f970f00f8a7a874a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a00a6ce4851db328e0cc41f193cf4a9505abb0f433300f5c515f9509065346078fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a0c051c339d1f3404c272164bcc02665ebfd113f77437d70822ec1da130b54c64b8847bee279d114779df862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6ce",
                         "s" : "0x18d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -243,44 +258,44 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f24770d989d5f8c004bfff5e4caed85a45cd0a95924fa2a47d0f2b1c1b65102c",
+        "lastblockhash" : "0x8f5c93af3a7bc64246aab1be74d04407e18e8d89e8a28dfc097705813360cc05",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45208",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4bdf7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -288,16 +303,16 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -306,36 +321,41 @@
         }
     },
     "NonZeroValue_TransactionCALL_ToOneStorageKey_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5208",
-                    "hash" : "cfc926e9ee5f52f944dbda1b479a40fb9dceefd1a05703aa73d3711966a778fe",
-                    "mixHash" : "61c371a491d51209f7cd39f5825d2bbc30db1d677362d941b665bcddd6d8cf28",
-                    "nonce" : "4290f2c6816eec9e",
+                    "hash" : "0x27c80e3b913702855e393bf19db8ed29f1ece6c7ec8cbc9ab7cf1855c75d009f",
+                    "mixHash" : "0x92be6161f10ed62b592e9622e177665321501fa865d89967f02ac720d2e1c660",
+                    "nonce" : "0x60dd65c282072e88",
                     "number" : "0x01",
-                    "parentHash" : "1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
-                    "receiptTrie" : "0a6ce4851db328e0cc41f193cf4a9505abb0f433300f5c515f9509065346078f",
-                    "stateRoot" : "dc691530afbac5b100bff6b20fff075db8d5aabd11ac30f89f970f00f8a7a874",
+                    "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+                    "receiptTrie" : "0x0a6ce4851db328e0cc41f193cf4a9505abb0f433300f5c515f9509065346078f",
+                    "stateRoot" : "0xdc691530afbac5b100bff6b20fff075db8d5aabd11ac30f89f970f00f8a7a874",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc691530afbac5b100bff6b20fff075db8d5aabd11ac30f89f970f00f8a7a874a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a00a6ce4851db328e0cc41f193cf4a9505abb0f433300f5c515f9509065346078fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a061c371a491d51209f7cd39f5825d2bbc30db1d677362d941b665bcddd6d8cf28884290f2c6816eec9ef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
+                "rlp" : "0xf9025ff901f7a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc691530afbac5b100bff6b20fff075db8d5aabd11ac30f89f970f00f8a7a874a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a00a6ce4851db328e0cc41f193cf4a9505abb0f433300f5c515f9509065346078fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a092be6161f10ed62b592e9622e177665321501fa865d89967f02ac720d2e1c6608860dd65c282072e88f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6ce",
                         "s" : "0x18d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -345,44 +365,158 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "cfc926e9ee5f52f944dbda1b479a40fb9dceefd1a05703aa73d3711966a778fe",
+        "lastblockhash" : "0x27c80e3b913702855e393bf19db8ed29f1ece6c7ec8cbc9ab7cf1855c75d009f",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f45208",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4bdf7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        }
+    },
+    "NonZeroValue_TransactionCALL_ToOneStorageKey_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x5208",
+                    "hash" : "0xa7a6151e211fe08126730a125895c1ac9a34e7ec9858b2fe3a91c65f56b67476",
+                    "mixHash" : "0x918aa0ad41e3ddb9470ad8c5322f11b303ed9c988805364b0e61380c199cddad",
+                    "nonce" : "0x9167ae8359cd486d",
+                    "number" : "0x01",
+                    "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+                    "receiptTrie" : "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2",
+                    "stateRoot" : "0xec035b851329bda5f4a6988d1635d43ea581871123a14ddcf2661f23fc47ed92",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec035b851329bda5f4a6988d1635d43ea581871123a14ddcf2661f23fc47ed92a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a0056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a0918aa0ad41e3ddb9470ad8c5322f11b303ed9c988805364b0e61380c199cddad889167ae8359cd486df862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6ce",
+                        "s" : "0x18d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa7a6151e211fe08126730a125895c1ac9a34e7ec9858b2fe3a91c65f56b67476",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45208",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4bdf7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -390,16 +524,16 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_d0g0v0.json
index 11f7ea9b6..45c9b6aa4 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "NonZeroValue_TransactionCALL_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALL_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5208",
-                    "hash" : "b547650a3bd57b2a4b1e78f0b0970535e86c27e06631b12878f4c4ecc00d68ba",
-                    "mixHash" : "c39c3cc3317d17e21b3fba0de30cb655ef3056b97cd2ffa105741fcf5f2d0657",
-                    "nonce" : "2209b56a5c301f3c",
+                    "hash" : "0xd48df4a71cc29959c1b44d7a95c43ff1dec4a3c541f1834d3884ee3f1ba02084",
+                    "mixHash" : "0x556366c5c5fbe837059eb6d7242aba37a8d172c4846e0a459752347134468546",
+                    "nonce" : "0x5bcc03d7ffba719a",
                     "number" : "0x01",
-                    "parentHash" : "35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-                    "receiptTrie" : "87e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8",
-                    "stateRoot" : "80f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2",
+                    "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+                    "receiptTrie" : "0x87e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8",
+                    "stateRoot" : "0x80f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a087e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a0c39c3cc3317d17e21b3fba0de30cb655ef3056b97cd2ffa105741fcf5f2d0657882209b56a5c301f3cf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
+                "rlp" : "0xf9025ff901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a087e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a0556366c5c5fbe837059eb6d7242aba37a8d172c4846e0a459752347134468546885bcc03d7ffba719af862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6ce",
                         "s" : "0x18d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -39,53 +44,53 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b547650a3bd57b2a4b1e78f0b0970535e86c27e06631b12878f4c4ecc00d68ba",
+        "lastblockhash" : "0xd48df4a71cc29959c1b44d7a95c43ff1dec4a3c541f1834d3884ee3f1ba02084",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45208",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4bdf7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -93,36 +98,41 @@
         }
     },
     "NonZeroValue_TransactionCALL_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALL_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5208",
-                    "hash" : "4daf3d955ffe83704cc68ebdf114a3a7c42e74497c63905c43cf832832de42d8",
-                    "mixHash" : "846d7fa1e20d350b035e38ecb9fb6036f79b2acc58b7b15fcffdd9c7f74ef36e",
-                    "nonce" : "b73e495f8d93a8dd",
+                    "hash" : "0x773a6c79e90604b69bead39a1be404845d76b7e5d3014b6aa8b924cb3a8348f4",
+                    "mixHash" : "0xbb1b8e56fef2daeb5e4853047483f24b14d314de4d64a58bbe1d8fb9db6442af",
+                    "nonce" : "0xa1b591781ffdabd1",
                     "number" : "0x01",
-                    "parentHash" : "35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-                    "receiptTrie" : "87e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8",
-                    "stateRoot" : "80f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2",
+                    "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+                    "receiptTrie" : "0x87e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8",
+                    "stateRoot" : "0x80f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a087e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a0846d7fa1e20d350b035e38ecb9fb6036f79b2acc58b7b15fcffdd9c7f74ef36e88b73e495f8d93a8ddf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
+                "rlp" : "0xf9025ff901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a087e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a0bb1b8e56fef2daeb5e4853047483f24b14d314de4d64a58bbe1d8fb9db6442af88a1b591781ffdabd1f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6ce",
                         "s" : "0x18d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -132,53 +142,53 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4daf3d955ffe83704cc68ebdf114a3a7c42e74497c63905c43cf832832de42d8",
+        "lastblockhash" : "0x773a6c79e90604b69bead39a1be404845d76b7e5d3014b6aa8b924cb3a8348f4",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45208",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4bdf7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -186,36 +196,41 @@
         }
     },
     "NonZeroValue_TransactionCALL_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALL_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5208",
-                    "hash" : "1ecb297e2a320cf4b812534837c528685b88ed69d8f7141a5080a140f515b8c2",
-                    "mixHash" : "8ea07c7c4a57fa742a455d438d40f97d42925c5ed5a612db3ddb2467535793ec",
-                    "nonce" : "f056582e2c2ef23c",
+                    "hash" : "0xf7362d55d9d98ff7978bf14c5286522f5ec9be235ae86f641fe517f2fc2f52ce",
+                    "mixHash" : "0xd0c173f7dc37f57da3e6f9c0fbfeedafe534f8eb64812ca02f8d526da9c9a4aa",
+                    "nonce" : "0x647a886b09263f79",
                     "number" : "0x01",
-                    "parentHash" : "35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-                    "receiptTrie" : "87e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8",
-                    "stateRoot" : "80f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2",
+                    "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+                    "receiptTrie" : "0x87e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8",
+                    "stateRoot" : "0x80f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a087e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a08ea07c7c4a57fa742a455d438d40f97d42925c5ed5a612db3ddb2467535793ec88f056582e2c2ef23cf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
+                "rlp" : "0xf9025ff901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a087e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a0d0c173f7dc37f57da3e6f9c0fbfeedafe534f8eb64812ca02f8d526da9c9a4aa88647a886b09263f79f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6ce",
                         "s" : "0x18d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -225,53 +240,53 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "1ecb297e2a320cf4b812534837c528685b88ed69d8f7141a5080a140f515b8c2",
+        "lastblockhash" : "0xf7362d55d9d98ff7978bf14c5286522f5ec9be235ae86f641fe517f2fc2f52ce",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45208",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4bdf7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -279,36 +294,41 @@
         }
     },
     "NonZeroValue_TransactionCALL_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALL_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5208",
-                    "hash" : "b1ae9019f67b2465c24aadac52eb273127085e1a4dd3027eefa8b69acd9ad3e3",
-                    "mixHash" : "1839b680d9d2898c2b08972db8e5e19cb0d30d2b10786592b55ca2addaadf63e",
-                    "nonce" : "4f4eb90ce0d04534",
+                    "hash" : "0xe7883829a8a07602234085743d6a530d3e9d7801f58b7f14a9b125c22715ff90",
+                    "mixHash" : "0xf36195a8c85e901965bc18b4fc36a8c27eda4ec07b93337239963db5fcbcb983",
+                    "nonce" : "0xfe42bf5633dde0f8",
                     "number" : "0x01",
-                    "parentHash" : "35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-                    "receiptTrie" : "87e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8",
-                    "stateRoot" : "80f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2",
+                    "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+                    "receiptTrie" : "0x87e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8",
+                    "stateRoot" : "0x80f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a087e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a01839b680d9d2898c2b08972db8e5e19cb0d30d2b10786592b55ca2addaadf63e884f4eb90ce0d04534f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
+                "rlp" : "0xf9025ff901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080f52fda7831aee0a2093998bca186fd1544872a9b9476c8f21bc9b865e1fcc2a0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a087e1d226d356161259d800e82b94c09ead7ec9bf4050b4421d99e6e193377cb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a0f36195a8c85e901965bc18b4fc36a8c27eda4ec07b93337239963db5fcbcb98388fe42bf5633dde0f8f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0927c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x6ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6ce",
                         "s" : "0x18d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -318,53 +338,158 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b1ae9019f67b2465c24aadac52eb273127085e1a4dd3027eefa8b69acd9ad3e3",
+        "lastblockhash" : "0xe7883829a8a07602234085743d6a530d3e9d7801f58b7f14a9b125c22715ff90",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f45208",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4bdf7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NonZeroValue_TransactionCALL_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALL_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x5208",
+                    "hash" : "0x65ef930659e9f672d65c19180fe976ac07e0ea4b2dde2ad7db647f26d3e9a953",
+                    "mixHash" : "0xd13fcc3c1d6978299cc009b1ecf3513a97e3b6feea2bfc8f11cd861b68ee12f7",
+                    "nonce" : "0x265734dc6d5ad7d9",
+                    "number" : "0x01",
+                    "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+                    "receiptTrie" : "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2",
+                    "stateRoot" : "0xe497936dea154cd010969fc600b291545660a95847ac541ba20e35592357063e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e497936dea154cd010969fc600b291545660a95847ac541ba20e35592357063ea0f24a60f7d08c1650470929f7541bbcab99de0cefd0c662a8f1e0d6e8e05f1042a0056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808252088203e880a0d13fcc3c1d6978299cc009b1ecf3513a97e3b6feea2bfc8f11cd861b68ee12f788265734dc6d5ad7d9f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba06ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6cea018d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6ebb662fa6b0332ead22704d6d7b4f11f8a5e2678071327035f090a40e0ef6ce",
+                        "s" : "0x18d73c5557e1936001ce1a61a79707d317ae8da3819e34667cffb326207c7757",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x65ef930659e9f672d65c19180fe976ac07e0ea4b2dde2ad7db647f26d3e9a953",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45208",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4bdf7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty_d0g0v0.json
index 72d6b43a1..cb6477fe9 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "NonZeroValue_TransactionCALLwithData_ToEmpty_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5758",
-                    "hash" : "4396ed6947b639c35e6f7bcf12767328175478dd19e058c5e1a294da9ea8ba53",
-                    "mixHash" : "92eaaf3429d210b85ab25c49ce7661a6d8b4b5e9f4dfe0455f856293244eff56",
-                    "nonce" : "0961411955a68eff",
+                    "hash" : "0x3cc79b5844dcc561ce15ff7d96e2de69813d7bc7ab4ef6fd5f0a6dc6ef2675a4",
+                    "mixHash" : "0x8a274ea3a39ecdb73d1e23507238f848c13c75629e712c5bec3c58c4430911a8",
+                    "nonce" : "0x5f35375759f02512",
                     "number" : "0x01",
-                    "parentHash" : "b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
-                    "receiptTrie" : "2221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596",
-                    "stateRoot" : "0e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686",
+                    "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+                    "receiptTrie" : "0x2221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596",
+                    "stateRoot" : "0x0e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90273f901f7a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a02221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a092eaaf3429d210b85ab25c49ce7661a6d8b4b5e9f4dfe0455f856293244eff56880961411955a68efff876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
+                "rlp" : "0xf90273f901f7a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a02221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a08a274ea3a39ecdb73d1e23507238f848c13c75629e712c5bec3c58c4430911a8885f35375759f02512f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
                 "transactions" : [
                     {
                         "data" : "0x1122334455667788991011121314151617181920",
@@ -29,7 +34,7 @@
                         "nonce" : "0x00",
                         "r" : "0xe7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203",
                         "s" : "0x25ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -39,60 +44,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4396ed6947b639c35e6f7bcf12767328175478dd19e058c5e1a294da9ea8ba53",
+        "lastblockhash" : "0x3cc79b5844dcc561ce15ff7d96e2de69813d7bc7ab4ef6fd5f0a6dc6ef2675a4",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45758",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4b8a7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -100,27 +105,32 @@
         }
     },
     "NonZeroValue_TransactionCALLwithData_ToEmpty_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5758",
-                    "hash" : "8e27dd54a2f75d44355dcddf299fca41b7bea9e1441171d0f03db5b58a5975f1",
-                    "mixHash" : "e34da6f926c4f8d085c53335335a8859b90335b0fd64fc149ddf266dfc9b4a5b",
-                    "nonce" : "a00529b0981be0de",
+                    "hash" : "0xcda9e99adaf303cb16beddaa7fcc20bb1c8d7798ca4609d545b6f696a962ff02",
+                    "mixHash" : "0xa97407274802d937a5fb127a5849252b722b4f42cf1626cbe9adf11e2ccc7762",
+                    "nonce" : "0xc985f94fd13a2f5f",
                     "number" : "0x01",
-                    "parentHash" : "b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
-                    "receiptTrie" : "2221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596",
-                    "stateRoot" : "0e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686",
+                    "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+                    "receiptTrie" : "0x2221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596",
+                    "stateRoot" : "0x0e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90273f901f7a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a02221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a0e34da6f926c4f8d085c53335335a8859b90335b0fd64fc149ddf266dfc9b4a5b88a00529b0981be0def876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
+                "rlp" : "0xf90273f901f7a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a02221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a0a97407274802d937a5fb127a5849252b722b4f42cf1626cbe9adf11e2ccc776288c985f94fd13a2f5ff876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
                 "transactions" : [
                     {
                         "data" : "0x1122334455667788991011121314151617181920",
@@ -129,7 +139,7 @@
                         "nonce" : "0x00",
                         "r" : "0xe7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203",
                         "s" : "0x25ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -139,60 +149,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8e27dd54a2f75d44355dcddf299fca41b7bea9e1441171d0f03db5b58a5975f1",
+        "lastblockhash" : "0xcda9e99adaf303cb16beddaa7fcc20bb1c8d7798ca4609d545b6f696a962ff02",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45758",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4b8a7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -200,27 +210,32 @@
         }
     },
     "NonZeroValue_TransactionCALLwithData_ToEmpty_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5758",
-                    "hash" : "b1cc0aa910158ba60f260824efdd471d5350b62a862627a12a7fed520a716f31",
-                    "mixHash" : "f605d511653ccea199a6bc00a8ba00cc6993798747bd2f17baeca3a81ca37c5b",
-                    "nonce" : "2b134cd09dca6c28",
+                    "hash" : "0x01a4a6c0574a426724dc429dd12c28149904659bd5392ad7c691025af35abc49",
+                    "mixHash" : "0x38de59e769feafbcbbf7022b87bafb0514162fb9031338ff2d14b3b83a22c46e",
+                    "nonce" : "0xc92eadec6676e699",
                     "number" : "0x01",
-                    "parentHash" : "b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
-                    "receiptTrie" : "2221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596",
-                    "stateRoot" : "0e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686",
+                    "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+                    "receiptTrie" : "0x2221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596",
+                    "stateRoot" : "0x0e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90273f901f7a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a02221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a0f605d511653ccea199a6bc00a8ba00cc6993798747bd2f17baeca3a81ca37c5b882b134cd09dca6c28f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
+                "rlp" : "0xf90273f901f7a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a02221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a038de59e769feafbcbbf7022b87bafb0514162fb9031338ff2d14b3b83a22c46e88c92eadec6676e699f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
                 "transactions" : [
                     {
                         "data" : "0x1122334455667788991011121314151617181920",
@@ -229,7 +244,7 @@
                         "nonce" : "0x00",
                         "r" : "0xe7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203",
                         "s" : "0x25ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -239,60 +254,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b1cc0aa910158ba60f260824efdd471d5350b62a862627a12a7fed520a716f31",
+        "lastblockhash" : "0x01a4a6c0574a426724dc429dd12c28149904659bd5392ad7c691025af35abc49",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45758",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4b8a7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -300,27 +315,32 @@
         }
     },
     "NonZeroValue_TransactionCALLwithData_ToEmpty_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5758",
-                    "hash" : "04df4bcabb654df8b23f6e3433ef480858af8160f84463ef754251b28efc280c",
-                    "mixHash" : "d8fbe8997477a1ef94851985c12cb1b1b35313ae33c2d74bd5251ade8b1ee730",
-                    "nonce" : "6ad730a7b9c1d606",
+                    "hash" : "0x9b279998a93185f6188f409ce34247f667344a95921db753e7be7070429830e5",
+                    "mixHash" : "0x18152626ffcc3867795a0f3a205f71f9a3e4f61d533a9a177d6bf70c5b8b87b4",
+                    "nonce" : "0xbb602101c518f208",
                     "number" : "0x01",
-                    "parentHash" : "b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
-                    "receiptTrie" : "2221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596",
-                    "stateRoot" : "0e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686",
+                    "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+                    "receiptTrie" : "0x2221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596",
+                    "stateRoot" : "0x0e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90273f901f7a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a02221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a0d8fbe8997477a1ef94851985c12cb1b1b35313ae33c2d74bd5251ade8b1ee730886ad730a7b9c1d606f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
+                "rlp" : "0xf90273f901f7a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a02221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a018152626ffcc3867795a0f3a205f71f9a3e4f61d533a9a177d6bf70c5b8b87b488bb602101c518f208f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
                 "transactions" : [
                     {
                         "data" : "0x1122334455667788991011121314151617181920",
@@ -329,7 +349,7 @@
                         "nonce" : "0x00",
                         "r" : "0xe7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203",
                         "s" : "0x25ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -339,60 +359,172 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "04df4bcabb654df8b23f6e3433ef480858af8160f84463ef754251b28efc280c",
+        "lastblockhash" : "0x9b279998a93185f6188f409ce34247f667344a95921db753e7be7070429830e5",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f45758",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4b8a7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NonZeroValue_TransactionCALLwithData_ToEmpty_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x5758",
+                    "hash" : "0x9dade1216478420d61f5df6e3a39e3e0b8b54a983d147994b40cf61900922963",
+                    "mixHash" : "0x1c6c42cb30d5bd41b7bd632db255f7200abf29f321da3a54db26071b57c16359",
+                    "nonce" : "0xa1b381242b763fb5",
+                    "number" : "0x01",
+                    "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+                    "receiptTrie" : "0xc118f32912dc1bd8f14a5689d0c96f8ee88adb36471e8f27ed7b7851be78c523",
+                    "stateRoot" : "0xea9caee621cf914057ffcaec475b549ac8a6144f6e51ce658f4a6013c353749b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90273f901f7a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ea9caee621cf914057ffcaec475b549ac8a6144f6e51ce658f4a6013c353749ba0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a0c118f32912dc1bd8f14a5689d0c96f8ee88adb36471e8f27ed7b7851be78c523b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a01c6c42cb30d5bd41b7bd632db255f7200abf29f321da3a54db26071b57c1635988a1b381242b763fb5f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
+                "transactions" : [
+                    {
+                        "data" : "0x1122334455667788991011121314151617181920",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203",
+                        "s" : "0x25ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9dade1216478420d61f5df6e3a39e3e0b8b54a983d147994b40cf61900922963",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45758",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4b8a7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance_d0g0v0.json
index 5089c9f7e..85cf4ada2 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5758",
-                    "hash" : "98bf3a13ff3991d560c51ef8a98787e463a3029c62fd398e8ab0446636a07dab",
-                    "mixHash" : "21ae0c980bdfb4bd6952c3d66e505fc98674548ac8eac77a404691cb2a74e16c",
-                    "nonce" : "b764bd26cec4f795",
+                    "hash" : "0x758352ce59c896a22fae36a654502bb21308996a7b13527dceff7d261edb3839",
+                    "mixHash" : "0x36e094902a651cf80c2c720871d1520ccede9e84ed527be207ab3599af7cd7c0",
+                    "nonce" : "0xace9d39076fbbf67",
                     "number" : "0x01",
-                    "parentHash" : "e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
-                    "receiptTrie" : "ebda4b8f35a9b7992c5a661a9a6337ee0fd42f1ae559498fef64ac9433b3f8de",
-                    "stateRoot" : "0a2c0aa4f7a67f8204cc71e0127de44e5c31115ccbb0591a89f71f064ce7aa10",
+                    "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+                    "receiptTrie" : "0xebda4b8f35a9b7992c5a661a9a6337ee0fd42f1ae559498fef64ac9433b3f8de",
+                    "stateRoot" : "0x0a2c0aa4f7a67f8204cc71e0127de44e5c31115ccbb0591a89f71f064ce7aa10",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90273f901f7a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a2c0aa4f7a67f8204cc71e0127de44e5c31115ccbb0591a89f71f064ce7aa10a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a0ebda4b8f35a9b7992c5a661a9a6337ee0fd42f1ae559498fef64ac9433b3f8deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a021ae0c980bdfb4bd6952c3d66e505fc98674548ac8eac77a404691cb2a74e16c88b764bd26cec4f795f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
+                "rlp" : "0xf90273f901f7a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a2c0aa4f7a67f8204cc71e0127de44e5c31115ccbb0591a89f71f064ce7aa10a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a0ebda4b8f35a9b7992c5a661a9a6337ee0fd42f1ae559498fef64ac9433b3f8deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a036e094902a651cf80c2c720871d1520ccede9e84ed527be207ab3599af7cd7c088ace9d39076fbbf67f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
                 "transactions" : [
                     {
                         "data" : "0x1122334455667788991011121314151617181920",
@@ -29,7 +34,7 @@
                         "nonce" : "0x00",
                         "r" : "0xe7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203",
                         "s" : "0x25ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -39,60 +44,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "98bf3a13ff3991d560c51ef8a98787e463a3029c62fd398e8ab0446636a07dab",
+        "lastblockhash" : "0x758352ce59c896a22fae36a654502bb21308996a7b13527dceff7d261edb3839",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45758",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4b8a7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x65",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -100,27 +105,32 @@
         }
     },
     "NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5758",
-                    "hash" : "0683718220bef36504ebc8cbc57ab4921cef6aba78a4a4684892da8fed973f50",
-                    "mixHash" : "ef8e7466cf5c761f56cf74df4f0402ed63d5230ba2ca7f4bfb35a6f8f7ab5957",
-                    "nonce" : "a37089bbd05e3242",
+                    "hash" : "0x7343b20d224d96f0ed7013e545af97236bfdf04d2e8081c0ca1c334e3efe9836",
+                    "mixHash" : "0x9d59ea78d103a294f42b3299f22c94fb306af8730b474d049418184a75ce819d",
+                    "nonce" : "0x3d46ef44f6445d7a",
                     "number" : "0x01",
-                    "parentHash" : "e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
-                    "receiptTrie" : "ebda4b8f35a9b7992c5a661a9a6337ee0fd42f1ae559498fef64ac9433b3f8de",
-                    "stateRoot" : "0a2c0aa4f7a67f8204cc71e0127de44e5c31115ccbb0591a89f71f064ce7aa10",
+                    "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+                    "receiptTrie" : "0xebda4b8f35a9b7992c5a661a9a6337ee0fd42f1ae559498fef64ac9433b3f8de",
+                    "stateRoot" : "0x0a2c0aa4f7a67f8204cc71e0127de44e5c31115ccbb0591a89f71f064ce7aa10",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90273f901f7a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a2c0aa4f7a67f8204cc71e0127de44e5c31115ccbb0591a89f71f064ce7aa10a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a0ebda4b8f35a9b7992c5a661a9a6337ee0fd42f1ae559498fef64ac9433b3f8deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a0ef8e7466cf5c761f56cf74df4f0402ed63d5230ba2ca7f4bfb35a6f8f7ab595788a37089bbd05e3242f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
+                "rlp" : "0xf90273f901f7a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a2c0aa4f7a67f8204cc71e0127de44e5c31115ccbb0591a89f71f064ce7aa10a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a0ebda4b8f35a9b7992c5a661a9a6337ee0fd42f1ae559498fef64ac9433b3f8deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a09d59ea78d103a294f42b3299f22c94fb306af8730b474d049418184a75ce819d883d46ef44f6445d7af876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
                 "transactions" : [
                     {
                         "data" : "0x1122334455667788991011121314151617181920",
@@ -129,7 +139,7 @@
                         "nonce" : "0x00",
                         "r" : "0xe7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203",
                         "s" : "0x25ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -139,60 +149,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0683718220bef36504ebc8cbc57ab4921cef6aba78a4a4684892da8fed973f50",
+        "lastblockhash" : "0x7343b20d224d96f0ed7013e545af97236bfdf04d2e8081c0ca1c334e3efe9836",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45758",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4b8a7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x65",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -200,27 +210,32 @@
         }
     },
     "NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5758",
-                    "hash" : "84017a1928a1ece1f38ffe538f9d81461f44a3350e270f2ac70c2a2c09edc132",
-                    "mixHash" : "81f1bef64d4e4863ba17e89915767c8de2d985c320542868554b58790969a7e8",
-                    "nonce" : "959c10fb8ac24148",
+                    "hash" : "0x628a9679bd412e15d7a5eb79ba6c3128a35c458a269310992fed2617d7adce3c",
+                    "mixHash" : "0xd45d7601fdaf5bc7d13ab4e7640dbb3762a7aa39441abc20666a5a4d22c576ff",
+                    "nonce" : "0x4f4b35ab13afa010",
                     "number" : "0x01",
-                    "parentHash" : "e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
-                    "receiptTrie" : "ebda4b8f35a9b7992c5a661a9a6337ee0fd42f1ae559498fef64ac9433b3f8de",
-                    "stateRoot" : "0a2c0aa4f7a67f8204cc71e0127de44e5c31115ccbb0591a89f71f064ce7aa10",
+                    "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+                    "receiptTrie" : "0xebda4b8f35a9b7992c5a661a9a6337ee0fd42f1ae559498fef64ac9433b3f8de",
+                    "stateRoot" : "0x0a2c0aa4f7a67f8204cc71e0127de44e5c31115ccbb0591a89f71f064ce7aa10",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90273f901f7a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a2c0aa4f7a67f8204cc71e0127de44e5c31115ccbb0591a89f71f064ce7aa10a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a0ebda4b8f35a9b7992c5a661a9a6337ee0fd42f1ae559498fef64ac9433b3f8deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a081f1bef64d4e4863ba17e89915767c8de2d985c320542868554b58790969a7e888959c10fb8ac24148f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
+                "rlp" : "0xf90273f901f7a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a2c0aa4f7a67f8204cc71e0127de44e5c31115ccbb0591a89f71f064ce7aa10a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a0ebda4b8f35a9b7992c5a661a9a6337ee0fd42f1ae559498fef64ac9433b3f8deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a0d45d7601fdaf5bc7d13ab4e7640dbb3762a7aa39441abc20666a5a4d22c576ff884f4b35ab13afa010f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
                 "transactions" : [
                     {
                         "data" : "0x1122334455667788991011121314151617181920",
@@ -229,7 +244,7 @@
                         "nonce" : "0x00",
                         "r" : "0xe7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203",
                         "s" : "0x25ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -239,60 +254,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "84017a1928a1ece1f38ffe538f9d81461f44a3350e270f2ac70c2a2c09edc132",
+        "lastblockhash" : "0x628a9679bd412e15d7a5eb79ba6c3128a35c458a269310992fed2617d7adce3c",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45758",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4b8a7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x65",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -300,27 +315,32 @@
         }
     },
     "NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5758",
-                    "hash" : "b5b8067cb8a2f1f6c56c401d10db9084a033910dae2ac83a12fcdd8546aec1e8",
-                    "mixHash" : "d466330252b2ab330ebb43b9e0dd9e694a73be6678b396327db451d99f6a1544",
-                    "nonce" : "edd88d8119e03df0",
+                    "hash" : "0x909ebf2a727c2c52793eab76d740ca6f069e571deedbdc3c2cc55fc30f55778c",
+                    "mixHash" : "0x640945ab75436899781c4173a4cab33ad283ae915742d3c47ada68930d4b464f",
+                    "nonce" : "0x5032674ceacbb5d2",
                     "number" : "0x01",
-                    "parentHash" : "e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
-                    "receiptTrie" : "ebda4b8f35a9b7992c5a661a9a6337ee0fd42f1ae559498fef64ac9433b3f8de",
-                    "stateRoot" : "0a2c0aa4f7a67f8204cc71e0127de44e5c31115ccbb0591a89f71f064ce7aa10",
+                    "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+                    "receiptTrie" : "0xebda4b8f35a9b7992c5a661a9a6337ee0fd42f1ae559498fef64ac9433b3f8de",
+                    "stateRoot" : "0x0a2c0aa4f7a67f8204cc71e0127de44e5c31115ccbb0591a89f71f064ce7aa10",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90273f901f7a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a2c0aa4f7a67f8204cc71e0127de44e5c31115ccbb0591a89f71f064ce7aa10a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a0ebda4b8f35a9b7992c5a661a9a6337ee0fd42f1ae559498fef64ac9433b3f8deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a0d466330252b2ab330ebb43b9e0dd9e694a73be6678b396327db451d99f6a154488edd88d8119e03df0f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
+                "rlp" : "0xf90273f901f7a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a2c0aa4f7a67f8204cc71e0127de44e5c31115ccbb0591a89f71f064ce7aa10a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a0ebda4b8f35a9b7992c5a661a9a6337ee0fd42f1ae559498fef64ac9433b3f8deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a0640945ab75436899781c4173a4cab33ad283ae915742d3c47ada68930d4b464f885032674ceacbb5d2f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
                 "transactions" : [
                     {
                         "data" : "0x1122334455667788991011121314151617181920",
@@ -329,7 +349,7 @@
                         "nonce" : "0x00",
                         "r" : "0xe7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203",
                         "s" : "0x25ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -339,60 +359,172 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b5b8067cb8a2f1f6c56c401d10db9084a033910dae2ac83a12fcdd8546aec1e8",
+        "lastblockhash" : "0x909ebf2a727c2c52793eab76d740ca6f069e571deedbdc3c2cc55fc30f55778c",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f45758",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4b8a7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x65",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x5758",
+                    "hash" : "0x209081ca3bebbef8f98a8a081497d32b753fe45f6e3931c467f9ea6d55226a34",
+                    "mixHash" : "0x4c0d73aa6ef4093e63e91c0688f14ed1d18925415e2dff850915e1ff9f6697ce",
+                    "nonce" : "0xf4ebb223cab201d7",
+                    "number" : "0x01",
+                    "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+                    "receiptTrie" : "0xc118f32912dc1bd8f14a5689d0c96f8ee88adb36471e8f27ed7b7851be78c523",
+                    "stateRoot" : "0x58da0bbed8cf9a9c1368f716d88df3e44ee38541dc4b1ff8db951afbae38b2f6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90273f901f7a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa058da0bbed8cf9a9c1368f716d88df3e44ee38541dc4b1ff8db951afbae38b2f6a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a0c118f32912dc1bd8f14a5689d0c96f8ee88adb36471e8f27ed7b7851be78c523b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a04c0d73aa6ef4093e63e91c0688f14ed1d18925415e2dff850915e1ff9f6697ce88f4ebb223cab201d7f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
+                "transactions" : [
+                    {
+                        "data" : "0x1122334455667788991011121314151617181920",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203",
+                        "s" : "0x25ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x209081ca3bebbef8f98a8a081497d32b753fe45f6e3931c467f9ea6d55226a34",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45758",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4b8a7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x65",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey_d0g0v0.json
index 1aac116ba..c0564ff7a 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "NonZeroValue_TransactionCALLwithData_ToOneStorageKey_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5758",
-                    "hash" : "11f169aed3cbe5e08ef1f325788fb391e06eef33ac3b809006c94fde501cce2d",
-                    "mixHash" : "0650b525db9e711929fd6f08ddaaf2d3036f14817ce11b16d40ef3a40bf46683",
-                    "nonce" : "dbcb180303dad7ca",
+                    "hash" : "0xb6e2f3eceb0b814801c8bfb973fd6a068397cb6cda6b5537c09b57ecfe91e272",
+                    "mixHash" : "0xa341362681b4d478083ec02ea5679050728b698cf07600997b6d082d667f2a38",
+                    "nonce" : "0xfebf4d46247342f6",
                     "number" : "0x01",
-                    "parentHash" : "1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
-                    "receiptTrie" : "516953cb21ddf3b4249efa8b22d35c71e641a60ab000992030e987addc920fb8",
-                    "stateRoot" : "d8d8c730b7c353ff63faae964dcd6900c6c6d38fc145955cefe81835238f7327",
+                    "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+                    "receiptTrie" : "0x516953cb21ddf3b4249efa8b22d35c71e641a60ab000992030e987addc920fb8",
+                    "stateRoot" : "0xd8d8c730b7c353ff63faae964dcd6900c6c6d38fc145955cefe81835238f7327",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90273f901f7a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8d8c730b7c353ff63faae964dcd6900c6c6d38fc145955cefe81835238f7327a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a0516953cb21ddf3b4249efa8b22d35c71e641a60ab000992030e987addc920fb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a00650b525db9e711929fd6f08ddaaf2d3036f14817ce11b16d40ef3a40bf4668388dbcb180303dad7caf876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
+                "rlp" : "0xf90273f901f7a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8d8c730b7c353ff63faae964dcd6900c6c6d38fc145955cefe81835238f7327a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a0516953cb21ddf3b4249efa8b22d35c71e641a60ab000992030e987addc920fb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a0a341362681b4d478083ec02ea5679050728b698cf07600997b6d082d667f2a3888febf4d46247342f6f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
                 "transactions" : [
                     {
                         "data" : "0x1122334455667788991011121314151617181920",
@@ -29,7 +34,7 @@
                         "nonce" : "0x00",
                         "r" : "0xe7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203",
                         "s" : "0x25ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -39,44 +44,44 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "11f169aed3cbe5e08ef1f325788fb391e06eef33ac3b809006c94fde501cce2d",
+        "lastblockhash" : "0xb6e2f3eceb0b814801c8bfb973fd6a068397cb6cda6b5537c09b57ecfe91e272",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45758",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4b8a7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -84,16 +89,16 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -102,27 +107,32 @@
         }
     },
     "NonZeroValue_TransactionCALLwithData_ToOneStorageKey_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5758",
-                    "hash" : "072861076c7ba68e3cb904c68e097070729d16410c5adbea0bb5c5066b967d38",
-                    "mixHash" : "712ca0ec0a2e3944c43e7e52a6f89c2f2262baff53a8d203533e53e0b629f749",
-                    "nonce" : "bdc6d16d0bd8029b",
+                    "hash" : "0x443621192c2395f080a726580d18dad7b48fd8125c66ddecc0bc4522494cef56",
+                    "mixHash" : "0x123c3b8b48f1470423d346a234bc8a4e11e1bf6bf18e363edba2624db9a6ba2e",
+                    "nonce" : "0xd4456c4d6319e9c8",
                     "number" : "0x01",
-                    "parentHash" : "1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
-                    "receiptTrie" : "516953cb21ddf3b4249efa8b22d35c71e641a60ab000992030e987addc920fb8",
-                    "stateRoot" : "d8d8c730b7c353ff63faae964dcd6900c6c6d38fc145955cefe81835238f7327",
+                    "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+                    "receiptTrie" : "0x516953cb21ddf3b4249efa8b22d35c71e641a60ab000992030e987addc920fb8",
+                    "stateRoot" : "0xd8d8c730b7c353ff63faae964dcd6900c6c6d38fc145955cefe81835238f7327",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90273f901f7a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8d8c730b7c353ff63faae964dcd6900c6c6d38fc145955cefe81835238f7327a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a0516953cb21ddf3b4249efa8b22d35c71e641a60ab000992030e987addc920fb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a0712ca0ec0a2e3944c43e7e52a6f89c2f2262baff53a8d203533e53e0b629f74988bdc6d16d0bd8029bf876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
+                "rlp" : "0xf90273f901f7a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8d8c730b7c353ff63faae964dcd6900c6c6d38fc145955cefe81835238f7327a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a0516953cb21ddf3b4249efa8b22d35c71e641a60ab000992030e987addc920fb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a0123c3b8b48f1470423d346a234bc8a4e11e1bf6bf18e363edba2624db9a6ba2e88d4456c4d6319e9c8f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
                 "transactions" : [
                     {
                         "data" : "0x1122334455667788991011121314151617181920",
@@ -131,7 +141,7 @@
                         "nonce" : "0x00",
                         "r" : "0xe7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203",
                         "s" : "0x25ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -141,44 +151,44 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "072861076c7ba68e3cb904c68e097070729d16410c5adbea0bb5c5066b967d38",
+        "lastblockhash" : "0x443621192c2395f080a726580d18dad7b48fd8125c66ddecc0bc4522494cef56",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45758",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4b8a7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -186,16 +196,16 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -204,27 +214,32 @@
         }
     },
     "NonZeroValue_TransactionCALLwithData_ToOneStorageKey_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5758",
-                    "hash" : "56bf3a98c361f4eea48b4568dd51064e3fc1d8451988a8cf4c9848b10536df54",
-                    "mixHash" : "13380e8b3610e6dd31ad12d6d4f0f5bbd33e2b5015ca2a9c140c0733fb9ae5e6",
-                    "nonce" : "e5b8de95dc60a1bd",
+                    "hash" : "0x874f60234687efade51e91d7a4e622b30aacbd020e50f889e761eedbfcc8f41a",
+                    "mixHash" : "0xd4e768f2b0d117968b9975c25de4bee1773fd6fce31ea0e1fd08be167f962405",
+                    "nonce" : "0x7980bb0dbc25def5",
                     "number" : "0x01",
-                    "parentHash" : "1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
-                    "receiptTrie" : "516953cb21ddf3b4249efa8b22d35c71e641a60ab000992030e987addc920fb8",
-                    "stateRoot" : "d8d8c730b7c353ff63faae964dcd6900c6c6d38fc145955cefe81835238f7327",
+                    "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+                    "receiptTrie" : "0x516953cb21ddf3b4249efa8b22d35c71e641a60ab000992030e987addc920fb8",
+                    "stateRoot" : "0xd8d8c730b7c353ff63faae964dcd6900c6c6d38fc145955cefe81835238f7327",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90273f901f7a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8d8c730b7c353ff63faae964dcd6900c6c6d38fc145955cefe81835238f7327a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a0516953cb21ddf3b4249efa8b22d35c71e641a60ab000992030e987addc920fb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a013380e8b3610e6dd31ad12d6d4f0f5bbd33e2b5015ca2a9c140c0733fb9ae5e688e5b8de95dc60a1bdf876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
+                "rlp" : "0xf90273f901f7a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8d8c730b7c353ff63faae964dcd6900c6c6d38fc145955cefe81835238f7327a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a0516953cb21ddf3b4249efa8b22d35c71e641a60ab000992030e987addc920fb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a0d4e768f2b0d117968b9975c25de4bee1773fd6fce31ea0e1fd08be167f962405887980bb0dbc25def5f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
                 "transactions" : [
                     {
                         "data" : "0x1122334455667788991011121314151617181920",
@@ -233,7 +248,7 @@
                         "nonce" : "0x00",
                         "r" : "0xe7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203",
                         "s" : "0x25ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -243,44 +258,44 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "56bf3a98c361f4eea48b4568dd51064e3fc1d8451988a8cf4c9848b10536df54",
+        "lastblockhash" : "0x874f60234687efade51e91d7a4e622b30aacbd020e50f889e761eedbfcc8f41a",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45758",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4b8a7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -288,16 +303,16 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -306,27 +321,32 @@
         }
     },
     "NonZeroValue_TransactionCALLwithData_ToOneStorageKey_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5758",
-                    "hash" : "78744634de6a95cf0b1af5d3956a1bc381e9cb4f68e5b7cb5ad50c08af29164f",
-                    "mixHash" : "f7d6ff11b750e59a501a77eb7847642eb479f487362b3e4d6ec1fc5f71154e89",
-                    "nonce" : "9e7c65b3b4f253ab",
+                    "hash" : "0xc487ab5651366dc91227ac47fcb870932f4589b9cfbe046ffd4421dd15f1cbdc",
+                    "mixHash" : "0xc70f6d944c06dd7240a40b982e711b376bdccc077ee6de3aa4640d958faefd20",
+                    "nonce" : "0x8d81e0eb1122b4a8",
                     "number" : "0x01",
-                    "parentHash" : "1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
-                    "receiptTrie" : "516953cb21ddf3b4249efa8b22d35c71e641a60ab000992030e987addc920fb8",
-                    "stateRoot" : "d8d8c730b7c353ff63faae964dcd6900c6c6d38fc145955cefe81835238f7327",
+                    "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+                    "receiptTrie" : "0x516953cb21ddf3b4249efa8b22d35c71e641a60ab000992030e987addc920fb8",
+                    "stateRoot" : "0xd8d8c730b7c353ff63faae964dcd6900c6c6d38fc145955cefe81835238f7327",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90273f901f7a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8d8c730b7c353ff63faae964dcd6900c6c6d38fc145955cefe81835238f7327a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a0516953cb21ddf3b4249efa8b22d35c71e641a60ab000992030e987addc920fb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a0f7d6ff11b750e59a501a77eb7847642eb479f487362b3e4d6ec1fc5f71154e89889e7c65b3b4f253abf876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
+                "rlp" : "0xf90273f901f7a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8d8c730b7c353ff63faae964dcd6900c6c6d38fc145955cefe81835238f7327a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a0516953cb21ddf3b4249efa8b22d35c71e641a60ab000992030e987addc920fb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a0c70f6d944c06dd7240a40b982e711b376bdccc077ee6de3aa4640d958faefd20888d81e0eb1122b4a8f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
                 "transactions" : [
                     {
                         "data" : "0x1122334455667788991011121314151617181920",
@@ -335,7 +355,7 @@
                         "nonce" : "0x00",
                         "r" : "0xe7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203",
                         "s" : "0x25ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -345,44 +365,158 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "78744634de6a95cf0b1af5d3956a1bc381e9cb4f68e5b7cb5ad50c08af29164f",
+        "lastblockhash" : "0xc487ab5651366dc91227ac47fcb870932f4589b9cfbe046ffd4421dd15f1cbdc",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f45758",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4b8a7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        }
+    },
+    "NonZeroValue_TransactionCALLwithData_ToOneStorageKey_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x5758",
+                    "hash" : "0xb48644bde6c762d6261e49b535f4defffb064f6130b8f9492b652a927ad39701",
+                    "mixHash" : "0x4e12e97180c541c7f042cb859395431096dc7bfa178e2b2b71261e641663d91d",
+                    "nonce" : "0x5080ed62e6cba692",
+                    "number" : "0x01",
+                    "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+                    "receiptTrie" : "0xc118f32912dc1bd8f14a5689d0c96f8ee88adb36471e8f27ed7b7851be78c523",
+                    "stateRoot" : "0x5e520b46ed5dc646f865851860501085602c08bc517a538388dd9c05a484af34",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90273f901f7a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e520b46ed5dc646f865851860501085602c08bc517a538388dd9c05a484af34a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a0c118f32912dc1bd8f14a5689d0c96f8ee88adb36471e8f27ed7b7851be78c523b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a04e12e97180c541c7f042cb859395431096dc7bfa178e2b2b71261e641663d91d885080ed62e6cba692f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
+                "transactions" : [
+                    {
+                        "data" : "0x1122334455667788991011121314151617181920",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203",
+                        "s" : "0x25ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb48644bde6c762d6261e49b535f4defffb064f6130b8f9492b652a927ad39701",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45758",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4b8a7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -390,16 +524,16 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_d0g0v0.json
index b3392db6a..9549246cb 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "NonZeroValue_TransactionCALLwithData_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5758",
-                    "hash" : "717ed224828b15fa491c1044554db08c731020243ee93e1bfa0982d9023214bc",
-                    "mixHash" : "b1f225ee04a5b9f39656f38ff0785e70cc079aeb00aa64643f093bfde969d129",
-                    "nonce" : "fd0c0cd9212fcc05",
+                    "hash" : "0x6188ea3e78d1b6d2be4fc9c2fc7b5b0dafa2e1a9325671f2b593638aba92b9e2",
+                    "mixHash" : "0xce57622759052e76ddbf83bdecbf7e3a18516d44bfaaf6e258b8fba871afbea7",
+                    "nonce" : "0x972ca26ebcf4db19",
                     "number" : "0x01",
-                    "parentHash" : "35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-                    "receiptTrie" : "2221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596",
-                    "stateRoot" : "0e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686",
+                    "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+                    "receiptTrie" : "0x2221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596",
+                    "stateRoot" : "0x0e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90273f901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a02221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a0b1f225ee04a5b9f39656f38ff0785e70cc079aeb00aa64643f093bfde969d12988fd0c0cd9212fcc05f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
+                "rlp" : "0xf90273f901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a02221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a0ce57622759052e76ddbf83bdecbf7e3a18516d44bfaaf6e258b8fba871afbea788972ca26ebcf4db19f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
                 "transactions" : [
                     {
                         "data" : "0x1122334455667788991011121314151617181920",
@@ -29,7 +34,7 @@
                         "nonce" : "0x00",
                         "r" : "0xe7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203",
                         "s" : "0x25ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -39,53 +44,53 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "717ed224828b15fa491c1044554db08c731020243ee93e1bfa0982d9023214bc",
+        "lastblockhash" : "0x6188ea3e78d1b6d2be4fc9c2fc7b5b0dafa2e1a9325671f2b593638aba92b9e2",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45758",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4b8a7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -93,27 +98,32 @@
         }
     },
     "NonZeroValue_TransactionCALLwithData_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5758",
-                    "hash" : "d9851940dfd6bae76f0acbab0e777a8c79d3d3dcfee5f46e93f389acd6393afe",
-                    "mixHash" : "dab0c5ee5193bc6072a8cd119374f5e8b6271586032c6dbfe98bdf36e0866343",
-                    "nonce" : "3b8d3c776215a15d",
+                    "hash" : "0xbcda4d734d35d94723f608c8af095b3e4b1f442215ac611a97f59f4d7abc03fc",
+                    "mixHash" : "0xd3cafce1fd96d6dcb7b6bc8f055150731d63e9037d4e77fe3c570b695bbb144f",
+                    "nonce" : "0x248ced2cd51539c3",
                     "number" : "0x01",
-                    "parentHash" : "35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-                    "receiptTrie" : "2221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596",
-                    "stateRoot" : "0e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686",
+                    "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+                    "receiptTrie" : "0x2221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596",
+                    "stateRoot" : "0x0e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90273f901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a02221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a0dab0c5ee5193bc6072a8cd119374f5e8b6271586032c6dbfe98bdf36e0866343883b8d3c776215a15df876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
+                "rlp" : "0xf90273f901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a02221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a0d3cafce1fd96d6dcb7b6bc8f055150731d63e9037d4e77fe3c570b695bbb144f88248ced2cd51539c3f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
                 "transactions" : [
                     {
                         "data" : "0x1122334455667788991011121314151617181920",
@@ -122,7 +132,7 @@
                         "nonce" : "0x00",
                         "r" : "0xe7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203",
                         "s" : "0x25ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -132,53 +142,53 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d9851940dfd6bae76f0acbab0e777a8c79d3d3dcfee5f46e93f389acd6393afe",
+        "lastblockhash" : "0xbcda4d734d35d94723f608c8af095b3e4b1f442215ac611a97f59f4d7abc03fc",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45758",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4b8a7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -186,27 +196,32 @@
         }
     },
     "NonZeroValue_TransactionCALLwithData_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5758",
-                    "hash" : "621ebded0437c5ed156240fd59cae1c40deebc3a2ed5599fe2309e7b1f8688c0",
-                    "mixHash" : "54b815fc0c862521e8a11bc995e2eea421e6f3ce27fa2fce1483dd299a364940",
-                    "nonce" : "8b7e5aa8e968f305",
+                    "hash" : "0xc5bd7d2659fa68b7472109f7b6f0be6fe11c374164c06243adf27d8010e0f8b4",
+                    "mixHash" : "0x7fec390d90bd39b1297469aa16411274a6590be61384acba86ef001523581ee4",
+                    "nonce" : "0x6b1dd58975e2d04e",
                     "number" : "0x01",
-                    "parentHash" : "35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-                    "receiptTrie" : "2221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596",
-                    "stateRoot" : "0e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686",
+                    "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+                    "receiptTrie" : "0x2221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596",
+                    "stateRoot" : "0x0e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90273f901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a02221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a054b815fc0c862521e8a11bc995e2eea421e6f3ce27fa2fce1483dd299a364940888b7e5aa8e968f305f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
+                "rlp" : "0xf90273f901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a02221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a07fec390d90bd39b1297469aa16411274a6590be61384acba86ef001523581ee4886b1dd58975e2d04ef876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
                 "transactions" : [
                     {
                         "data" : "0x1122334455667788991011121314151617181920",
@@ -215,7 +230,7 @@
                         "nonce" : "0x00",
                         "r" : "0xe7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203",
                         "s" : "0x25ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -225,53 +240,53 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "621ebded0437c5ed156240fd59cae1c40deebc3a2ed5599fe2309e7b1f8688c0",
+        "lastblockhash" : "0xc5bd7d2659fa68b7472109f7b6f0be6fe11c374164c06243adf27d8010e0f8b4",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45758",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4b8a7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -279,27 +294,32 @@
         }
     },
     "NonZeroValue_TransactionCALLwithData_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5758",
-                    "hash" : "9eb16cb1109fa94b16c50c25d5b2e5b5299fa3da11679f5b10145ac53d83e429",
-                    "mixHash" : "d63186f9d4c45394da8f1cc3f3a0fbb7a045f4d411ddcebe48a6c2287945c2e0",
-                    "nonce" : "8a1f67dec8907a6c",
+                    "hash" : "0x7d66227b15cdc6ca21110e3deb17e09182c22d2d4bc4bd206ec1a176fb2e6147",
+                    "mixHash" : "0x92fbe5b52bf2b51d7027c76c06c6ac6b81367c64215f926c935cdb62661f17c0",
+                    "nonce" : "0xfa1b2c8b06117905",
                     "number" : "0x01",
-                    "parentHash" : "35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-                    "receiptTrie" : "2221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596",
-                    "stateRoot" : "0e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686",
+                    "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+                    "receiptTrie" : "0x2221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596",
+                    "stateRoot" : "0x0e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xf06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90273f901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a02221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a0d63186f9d4c45394da8f1cc3f3a0fbb7a045f4d411ddcebe48a6c2287945c2e0888a1f67dec8907a6cf876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
+                "rlp" : "0xf90273f901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e5e8971fa2839ebfcd73827d8f9502b413c329cab19685e5f412a057cf63686a0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a02221aa3d121d66caab6934509f1d27cf617a8fd45c9f995ce5569b1b023b1596b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a092fbe5b52bf2b51d7027c76c06c6ac6b81367c64215f926c935cdb62661f17c088fa1b2c8b06117905f876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
                 "transactions" : [
                     {
                         "data" : "0x1122334455667788991011121314151617181920",
@@ -308,7 +328,7 @@
                         "nonce" : "0x00",
                         "r" : "0xe7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203",
                         "s" : "0x25ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12",
-                        "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -318,53 +338,158 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9eb16cb1109fa94b16c50c25d5b2e5b5299fa3da11679f5b10145ac53d83e429",
+        "lastblockhash" : "0x7d66227b15cdc6ca21110e3deb17e09182c22d2d4bc4bd206ec1a176fb2e6147",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f45758",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4b8a7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NonZeroValue_TransactionCALLwithData_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x5758",
+                    "hash" : "0x7ab212717f9844ab9fdc13b21344bcc0819c9be103486a8267e8dc88f6ae49ef",
+                    "mixHash" : "0xb3da9f86c3f43536ee9eae0223f557d1a8f8504de4a3d5635bd09745c9c68374",
+                    "nonce" : "0x8bfdeec5d814d3bf",
+                    "number" : "0x01",
+                    "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+                    "receiptTrie" : "0xc118f32912dc1bd8f14a5689d0c96f8ee88adb36471e8f27ed7b7851be78c523",
+                    "stateRoot" : "0xea9caee621cf914057ffcaec475b549ac8a6144f6e51ce658f4a6013c353749b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90273f901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ea9caee621cf914057ffcaec475b549ac8a6144f6e51ce658f4a6013c353749ba0f06b7865f9815b87966bf85f209ef033842530cacd70091c5b3eda09057a8bf9a0c118f32912dc1bd8f14a5689d0c96f8ee88adb36471e8f27ed7b7851be78c523b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257588203e880a0b3da9f86c3f43536ee9eae0223f557d1a8f8504de4a3d5635bd09745c9c68374888bfdeec5d814d3bff876f8748001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b019411223344556677889910111213141516171819201ba0e7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203a025ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12c0",
+                "transactions" : [
+                    {
+                        "data" : "0x1122334455667788991011121314151617181920",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe7b071c0284506bf00b0d80a0513e6d32765d601a607a416200c9f460e8f8203",
+                        "s" : "0x25ca64ca394548e13bc38b1a1723a151c10eccb5dac4117bf26faee663962d12",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7ab212717f9844ab9fdc13b21344bcc0819c9be103486a8267e8dc88f6ae49ef",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45758",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a4b8a7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }